Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-09 03:58:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove bSupportsGLSLLocation since it won't work how I expect it.

Browse source
This commit is contained in:
Ryan Houdek 2011-12-09 19:14:02 -06:00
parent 4fe9792760
commit e8087aa1a9
6 changed files with 26 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
View file

@ -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);