piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

OGL: update ubo workaround

Browse Source
This commit is contained in:
degasus
2013-10-08 14:34:42 +02:00
parent cc6c454898
commit 5de7ac4791
5 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/Src/ConstantManager.h
View File

@ -18,7 +18,7 @@ struct PixelShaderConstants
float4 texdims[8];
float4 zbias[2];
float4 indtexscale[2];
float4 indtexmts[6];
float4 indtexmtx[6];
float4 fog[3];
// For pixel lighting

1
Source/Core/VideoCommon/Src/PixelShaderGen.h
View File

@ -21,6 +21,7 @@
#define I_PLIGHTS "cPLights"
#define I_PMATERIALS "cPmtrl"
// TODO: get rid of them as they aren't used
#define C_COLORMATRIX 0 // 0
#define C_COLORS 0 // 0
#define C_KCOLORS (C_COLORS + 4) // 4

16
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
View File

@ -188,14 +188,14 @@ void PixelShaderManager::SetIndMatrixChanged(int matrixidx)
// xyz - static matrix
// TODO w - dynamic matrix scale / 256...... somehow / 4 works better
// rev 2972 - now using / 256.... verify that this works
constants.indtexmts[2*matrixidx][0] = bpmem.indmtx[matrixidx].col0.ma * fscale;
constants.indtexmts[2*matrixidx][1] = bpmem.indmtx[matrixidx].col1.mc * fscale;
constants.indtexmts[2*matrixidx][2] = bpmem.indmtx[matrixidx].col2.me * fscale;
constants.indtexmts[2*matrixidx][3] = fscale * 4.0f;
constants.indtexmts[2*matrixidx+1][0] = bpmem.indmtx[matrixidx].col0.mb * fscale;
constants.indtexmts[2*matrixidx+1][1] = bpmem.indmtx[matrixidx].col1.md * fscale;
constants.indtexmts[2*matrixidx+1][2] = bpmem.indmtx[matrixidx].col2.mf * fscale;
constants.indtexmts[2*matrixidx+1][3] = fscale * 4.0f;
constants.indtexmtx[2*matrixidx][0] = bpmem.indmtx[matrixidx].col0.ma * fscale;
constants.indtexmtx[2*matrixidx][1] = bpmem.indmtx[matrixidx].col1.mc * fscale;
constants.indtexmtx[2*matrixidx][2] = bpmem.indmtx[matrixidx].col2.me * fscale;
constants.indtexmtx[2*matrixidx][3] = fscale * 4.0f;
constants.indtexmtx[2*matrixidx+1][0] = bpmem.indmtx[matrixidx].col0.mb * fscale;
constants.indtexmtx[2*matrixidx+1][1] = bpmem.indmtx[matrixidx].col1.md * fscale;
constants.indtexmtx[2*matrixidx+1][2] = bpmem.indmtx[matrixidx].col2.mf * fscale;
constants.indtexmtx[2*matrixidx+1][3] = fscale * 4.0f;
dirty = true;
PRIM_LOG("indmtx%d: scale=%f, mat=(%f %f %f; %f %f %f)\n",