ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ValidateShaderIDs

This commit is contained in:
degasus 2013-02-13 15:16:32 +01:00
parent bbc292c210
commit 398b37f371
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
View File

@ -222,7 +222,7 @@ SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 componen
if (g_ActiveConfig.bEnableShaderDebugging) if (g_ActiveConfig.bEnableShaderDebugging)
{ {
GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode, components); GetSafeShaderId(&newentry.safe_uid, dstAlphaMode, components);
newentry.shader.strvprog = vcode; newentry.shader.strvprog = vcode;
newentry.shader.strpprog = pcode; 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 ) 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);
} }

2
Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
View File

@ -85,7 +85,7 @@ public:
struct PCacheEntry struct PCacheEntry
{ {
SHADER shader; SHADER shader;
PIXELSHADERUIDSAFE safe_uid; SHADERUIDSAFE safe_uid;
static GLenum prog_format; static GLenum prog_format;
u8 *binary; u8 *binary;