Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix uniform dirtying on colortest mask.

Browse source
This commit is contained in:
Unknown W. Brackets 2014-04-21 22:53:19 -07:00
parent 1bbd3d04af
commit 38b92e48ec
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
GPU/GLES/GLES_GPU.cpp
View file

@ -123,10 +123,10 @@ static const CommandTableEntry commandTable[] = {
{GE_CMD_TEXSHADELS, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_TEXSHADELS, FLAG_FLUSHBEFOREONCHANGE},
{GE_CMD_SHADEMODE, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_SHADEMODE, FLAG_FLUSHBEFOREONCHANGE},
{GE_CMD_TEXFUNC, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_TEXFUNC, FLAG_FLUSHBEFOREONCHANGE},
{GE_CMD_COLORTEST, FLAG_FLUSHBEFOREONCHANGE, &GLES_GPU::Execute_ColorTest}, {GE_CMD_COLORTEST, FLAG_FLUSHBEFOREONCHANGE},
{GE_CMD_ALPHATESTENABLE, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_ALPHATESTENABLE, FLAG_FLUSHBEFOREONCHANGE},
{GE_CMD_COLORTESTENABLE, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_COLORTESTENABLE, FLAG_FLUSHBEFOREONCHANGE},
{GE_CMD_COLORTESTMASK, FLAG_FLUSHBEFOREONCHANGE, &GLES_GPU::Execute_ColorTest}, {GE_CMD_COLORTESTMASK, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTEONCHANGE, &GLES_GPU::Execute_ColorTestMask},
// These change the vertex shader so need flushing. // These change the vertex shader so need flushing.
{GE_CMD_REVERSENORMAL, FLAG_FLUSHBEFOREONCHANGE}, // TODO: This one is actually processed during vertex decoding which is wrong. {GE_CMD_REVERSENORMAL, FLAG_FLUSHBEFOREONCHANGE}, // TODO: This one is actually processed during vertex decoding which is wrong.
@ -1046,7 +1046,7 @@ void GLES_GPU::Execute_Light3Param(u32 op, u32 diff) {
shaderManager_->DirtyUniform(DIRTY_LIGHT3); shaderManager_->DirtyUniform(DIRTY_LIGHT3);
} }
void GLES_GPU::Execute_ColorTest(u32 op, u32 diff) { void GLES_GPU::Execute_ColorTestMask(u32 op, u32 diff) {
shaderManager_->DirtyUniform(DIRTY_COLORMASK); shaderManager_->DirtyUniform(DIRTY_COLORMASK);
} }
@ -1603,8 +1603,10 @@ void GLES_GPU::ExecuteOpInternal(u32 op, u32 diff) {
break; break;
case GE_CMD_COLORTEST: case GE_CMD_COLORTEST:
break;
case GE_CMD_COLORTESTMASK: case GE_CMD_COLORTESTMASK:
Execute_ColorTest(op, diff); Execute_ColorTestMask(op, diff);
break; break;
case GE_CMD_ALPHATEST: case GE_CMD_ALPHATEST:

2
GPU/GLES/GLES_GPU.h
View file

@ -117,7 +117,7 @@ public:
void Execute_Light1Param(u32 op, u32 diff); void Execute_Light1Param(u32 op, u32 diff);
void Execute_Light2Param(u32 op, u32 diff); void Execute_Light2Param(u32 op, u32 diff);
void Execute_Light3Param(u32 op, u32 diff); void Execute_Light3Param(u32 op, u32 diff);
void Execute_ColorTest(u32 op, u32 diff); void Execute_ColorTestMask(u32 op, u32 diff);
void Execute_AlphaTest(u32 op, u32 diff); void Execute_AlphaTest(u32 op, u32 diff);
void Execute_StencilTest(u32 op, u32 diff); void Execute_StencilTest(u32 op, u32 diff);
void Execute_ColorRef(u32 op, u32 diff); void Execute_ColorRef(u32 op, u32 diff);