diff options
| author | skidau <skidau@gmail.com> | 2012-05-26 13:47:07 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2012-05-26 13:47:07 +1000 |
| commit | 146b02615c07dd52dddaa18b7e23d09bc23b549e (patch) | |
| tree | 3455f3d24090458d85142ea335ca37a00056b981 /Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp | |
| parent | 82cb14e49bc4bbd463427243248a92ef1a58db3f (diff) | |
| parent | 5650b3b5f6c4d915827768b6bb1f4f4c49982b21 (diff) | |
Merge rodolfoosvaldobogado's zcomploc code (Graphic_Fixes branch)
Diffstat (limited to 'Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp index f66d096ab6..6e99c49749 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp @@ -330,11 +330,11 @@ void PixelShaderCache::Shutdown() unique_shaders.clear(); } -bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) +bool PixelShaderCache::SetShader(PSGRENDER_MODE PSGRenderMode, u32 components) { const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30; PIXELSHADERUID uid; - GetPixelShaderId(&uid, dstAlphaMode, components); + GetPixelShaderId(&uid, PSGRenderMode, components); // Check if the shader is already set if (last_entry) @@ -342,7 +342,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (uid == last_uid) { GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(api, last_entry->safe_uid, last_entry->code, dstAlphaMode, components); + ValidatePixelShaderIDs(api, last_entry->safe_uid, last_entry->code, PSGRenderMode, components); return last_entry->shader != NULL; } } @@ -359,13 +359,13 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (entry.shader) D3D::SetPixelShader(entry.shader); GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); - ValidatePixelShaderIDs(api, entry.safe_uid, entry.code, dstAlphaMode, components); + ValidatePixelShaderIDs(api, entry.safe_uid, entry.code, PSGRenderMode, components); return (entry.shader != NULL); } // Need to compile a new shader - const char *code = GeneratePixelShaderCode(dstAlphaMode, api, components); + const char *code = GeneratePixelShaderCode(PSGRenderMode, api, components); if (g_ActiveConfig.bEnableShaderDebugging) { @@ -401,7 +401,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components) if (g_ActiveConfig.bEnableShaderDebugging && success) { PixelShaders[uid].code = code; - GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode, components); + GetSafePixelShaderId(&PixelShaders[uid].safe_uid, PSGRenderMode, components); } GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true); |