From 4fff5ac90dc674f775dcf7d57b5b513f62f87fc5 Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 5 Jan 2014 09:52:26 +0100 Subject: OpenGL: drop UBO-workaround usage for efb2ram shaders It's just brainfuck to use this workaroung there. Just fetch the uniform location like all other util shaders. --- Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp') diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index d1782196fb..f4e7dcb6a7 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -108,15 +108,14 @@ void SHADER::SetProgramVariables() } // UBO workaround - for (int a = 0; a < NUM_UNIFORMS; ++a) - { - UniformLocations[a] = glGetUniformLocation(glprogid, UniformNames[a]); - UniformSize[a] = 0; - if(g_ActiveConfig.backend_info.bSupportsGLSLUBO) - break; - } if(!g_ActiveConfig.backend_info.bSupportsGLSLUBO) { + for (int a = 0; a < NUM_UNIFORMS; ++a) + { + UniformLocations[a] = glGetUniformLocation(glprogid, UniformNames[a]); + UniformSize[a] = 0; + } + int max_uniforms = 0; char name[50]; int size; -- cgit v1.2.3