summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2011-09-04 05:38:32 +0200
committerPierre Bourdon <delroth@gmail.com>2011-09-04 05:38:32 +0200
commitd3ecf9821335fde15d429ffc1bd58dc0b4f6c665 (patch)
tree5b4357a86d4e52c2d459ca55831af992df11eabf /Source/Core/VideoCommon/Src/PixelShaderGen.cpp
parent0bdf8646f09c2f7cf2324ddf6cacf6cc1b31da07 (diff)
Include the zcomploc bit in the shader UID
Fixes issues with switching zcomploc on/off during execution.
Diffstat (limited to 'Source/Core/VideoCommon/Src/PixelShaderGen.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/PixelShaderGen.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 50de52df51..e4944c842c 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -62,7 +62,8 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode)
uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel |
((u32)bpmem.fog.c_proj_fsel.proj << 3) |
- ((u32)enableZTexture << 4) | ((u32)bpmem.fogRange.Base.Enabled << 5);
+ ((u32)enableZTexture << 4) | ((u32)bpmem.fogRange.Base.Enabled << 5) |
+ ((u32)bpmem.zcontrol.zcomploc << 6);
if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
{
@@ -1148,7 +1149,7 @@ static bool WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode
WRITE(p, "depth = 1.f;\n");
if (!bpmem.zcontrol.zcomploc)
{
- WRITE(p, "discard;\n");
+ WRITE(p, "discard;\n");
if (ApiType != API_D3D11)
WRITE(p, "return;\n");
}