From 4cd748bbec15d046caff1c50f456c37ab1688c94 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 26 Dec 2011 03:54:44 -0600 Subject: [PATCH] Remove some warnings in ProgramShadercache, Was using wrong variable for checking dual source blending. --- Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++-- 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 08891ddf19..73453c1395 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -957,8 +957,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 8fc84a6c9e..7e2919e7f8 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp @@ -170,7 +170,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;