diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2011-12-09 19:14:02 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2011-12-09 19:14:02 -0600 |
| commit | e8087aa1a9f3471be92af06d6f35917eb835642c (patch) | |
| tree | 1b42a11f010b88480d2487fe93d84d0c569f789d /Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp | |
| parent | 4fe9792760013e54cb2f6b21697b960dd280c3ae (diff) | |
Remove bSupportsGLSLLocation since it won't work how I expect it.
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp index 978357e18f..7e18e54c7b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp @@ -81,11 +81,6 @@ void PixelShaderCache::Init() // Should this be set here? if (strstr((const char*)glGetString(GL_EXTENSIONS), "GL_ARB_shading_language_420pack") != NULL) g_Config.backend_info.bSupportsGLSLBinding = true; - // This bit doesn't quite work yet, always set to false - // TODO: Probably just drop this entirely in favour of UBOS - //if (strstr((const char*)glGetString(GL_EXTENSIONS), "GL_ARB_separate_shader_objects") != NULL) - g_Config.backend_info.bSupportsGLSLLocation = false; - if (strstr((const char*)glGetString(GL_EXTENSIONS), "GL_ARB_uniform_buffer_object") != NULL) g_Config.backend_info.bSupportsGLSLUBO = true; @@ -505,11 +500,6 @@ void SetGLSLPSConstant4f(unsigned int const_number, float f1, float f2, float f3 { float f[4] = { f1, f2, f3, f4 }; - if (g_ActiveConfig.backend_info.bSupportsGLSLLocation) - { - glUniform4fv(const_number, 1, f); - return; - } if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(0, const_number, f); @@ -528,11 +518,6 @@ void SetGLSLPSConstant4f(unsigned int const_number, float f1, float f2, float f3 void SetGLSLPSConstant4fv(unsigned int const_number, const float *f) { - if (g_ActiveConfig.backend_info.bSupportsGLSLLocation) - { - glUniform4fv(const_number, 1, f); - return; - } if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(0, const_number, f); @@ -551,11 +536,6 @@ void SetGLSLPSConstant4fv(unsigned int const_number, const float *f) void SetMultiGLSLPSConstant4fv(unsigned int const_number, unsigned int count, const float *f) { - if (g_ActiveConfig.backend_info.bSupportsGLSLLocation) - { - glUniform4fv(const_number, count, f); - return; - } if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { ProgramShaderCache::SetUniformObjects(0, const_number, f, count); |