diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2011-12-09 21:15:15 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2011-12-09 21:15:15 -0600 |
| commit | 54a90d08cec61253634c06e7dfc494c19f2cc253 (patch) | |
| tree | dcddb884b58af6bea7a8262c4185c287ef004ce9 /Source/Plugins | |
| parent | e8087aa1a9f3471be92af06d6f35917eb835642c (diff) | |
Fix one error.
Diffstat (limited to 'Source/Plugins')
3 files changed, 7 insertions, 8 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index 7e18e54c7b..50382cc0dd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -503,7 +503,7 @@ void SetGLSLPSConstant4f(unsigned int const_number, float f1, float f2, float f3 if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(0, const_number, f); - return; + //return; } for (unsigned int a = 0; a < 10; ++a) { @@ -521,7 +521,7 @@ void SetGLSLPSConstant4fv(unsigned int const_number, const float *f) if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(0, const_number, f); - return; + //return; } for (unsigned int a = 0; a < 10; ++a) { @@ -539,7 +539,7 @@ void SetMultiGLSLPSConstant4fv(unsigned int const_number, unsigned int count, co if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(0, const_number, f, count); - return; + //return; } for (unsigned int a = 0; a < 10; ++a) { diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index c7c8624069..9fd3479e1d 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -94,7 +94,6 @@ namespace OGL glLinkProgram(entry.program.glprogid); glUseProgram(entry.program.glprogid); - // We cache our uniform locations for now // Once we move up to a newer version of GLSL, ~1.30 diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp index d0fb9ec189..e22a2f3be2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp @@ -250,7 +250,7 @@ void SetGLSLVSConstant4f(unsigned int const_number, float f1, float f2, float f3 if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(1, const_number, buf); - return; + //return; } for( unsigned int a = 0; a < 9; ++a) { @@ -268,7 +268,7 @@ void SetGLSLVSConstant4fv(unsigned int const_number, const float *f) if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(1, const_number, f); - return; + //return; } for( unsigned int a = 0; a < 9; ++a) { @@ -286,7 +286,7 @@ void SetMultiGLSLVSConstant4fv(unsigned int const_number, unsigned int count, co if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(1, const_number, f, count); - return; + //return; } for( unsigned int a = 0; a < 9; ++a) { @@ -312,7 +312,7 @@ void SetMultiGLSLVSConstant3fv(unsigned int const_number, unsigned int count, co if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(1, const_number, buf, count); - return; + //return; } for( unsigned int a = 0; a < 9; ++a) { |