From 398b37f371f5a9666ed70ac364650ad7b9412053 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 13 Feb 2013 15:16:32 +0100 Subject: [PATCH] fix ValidateShaderIDs --- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 5 +++-- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index fcffa175c6..d8de0c9149 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -222,7 +222,7 @@ SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 componen if (g_ActiveConfig.bEnableShaderDebugging) { - GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode, components); + GetSafeShaderId(&newentry.safe_uid, dstAlphaMode, components); newentry.shader.strvprog = vcode; newentry.shader.strpprog = pcode; } @@ -374,7 +374,8 @@ void ProgramShaderCache::GetSafeShaderId ( SHADERUIDSAFE* uid, DSTALPHA_MODE dst void ProgramShaderCache::ValidateShaderIDs ( PCacheEntry *entry, DSTALPHA_MODE dstAlphaMode, u32 components ) { - //ValidatePixelShaderIDs(API_OPENGL, entry->safe_uid, entry->shader.strprog, dstAlphaMode, components); + ValidateVertexShaderIDs(API_OPENGL, entry->safe_uid.vuid, entry->shader.strvprog, components); + ValidatePixelShaderIDs(API_OPENGL, entry->safe_uid.puid, entry->shader.strpprog, dstAlphaMode, components); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h index 76df0787e8..e4c9129836 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h @@ -85,7 +85,7 @@ public: struct PCacheEntry { SHADER shader; - PIXELSHADERUIDSAFE safe_uid; + SHADERUIDSAFE safe_uid; static GLenum prog_format; u8 *binary;