diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2011-12-26 03:54:44 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2011-12-26 03:54:44 -0600 |
| commit | 3773d29b6d2d4cd1f427bbbe8aac7d079b89e483 (patch) | |
| tree | 0d3da4f2c87036a7a747f4d16fe505d9da32657b /Source | |
| parent | 5f296d0be7ef76f28bf6b0025c19c5a553177635 (diff) | |
Remove some warnings in ProgramShadercache, Was using wrong variable for checking dual source blending.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h | 2 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h index d10cb202a0..d0743326dd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h @@ -48,7 +48,7 @@ public: ShaderUID uid; GLint UniformLocations[NUM_UNIFORMS]; - PCacheEntry() : prog_id(0), vsid(0), psid(0), binary(NULL), binary_size(0) { } + PCacheEntry() : prog_id(0), binary(NULL), binary_size(0), vsid(0), psid(0) { } ~PCacheEntry() { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index a54a8a83b3..ca641ff480 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -960,8 +960,8 @@ void Renderer::SetBlendMode(bool forceUpdate) u32 changes = forceUpdate ? 0xFFFFFFFF : newval ^ s_blendMode; bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate - && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24 && g_ActiveConfig.bUseGLSL; - bool useDualSource = useDstAlpha; + && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; + bool useDualSource = g_ActiveConfig.bUseGLSL && g_ActiveConfig.backend_info.bSupportsGLSLBind; if (changes & 1) // blend enable change diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp index 3913785407..35e783337a 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -178,7 +178,7 @@ void VertexManager::vFlush() && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; // Makes sure we can actually do Dual source blending - bool dualSourcePossible = g_ActiveConfig.bUseGLSL && g_ActiveConfig.backend_info.bSupportsGLSLATTRBind; + bool dualSourcePossible = g_ActiveConfig.bUseGLSL && g_ActiveConfig.backend_info.bSupportsGLSLBind; // finally bind FRAGMENTSHADER* ps; |