mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-09 20:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use UBOs in every shader. I had missed a few. Only cache Uniform locations if we aren't using UBOs.

Browse source
This commit is contained in:
Ryan Houdek 2011-12-10 15:40:10 -06:00 • committed by Sonicadvance1
parent 5bcbf92f43
commit 5b06bbf87d
4 changed files with 73 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
View file

@ -111,8 +111,9 @@ namespace OGL
//For some reason this fails on my hardware
//glGetUniformIndices(entry.program.glprogid, NUM_UNIFORMS, UniformNames, entry.program.UniformLocations);
//Got to do it this crappy way.
for(int a = 0; a < NUM_UNIFORMS; ++a)
entry.program.UniformLocations[a] = glGetUniformLocation(entry.program.glprogid, UniformNames[a]);
if(!g_ActiveConfig.backend_info.bSupportsGLSLUBO)
for(int a = 0; a < NUM_UNIFORMS; ++a)
entry.program.UniformLocations[a] = glGetUniformLocation(entry.program.glprogid, UniformNames[a]);
// Need to get some attribute locations
if(uid.uid.vsid != 0) // We have no vertex Shader
@ -176,7 +177,7 @@ namespace OGL
// Repeat for VS shader
glBindBuffer(GL_UNIFORM_BUFFER, UBOBuffers[1]);
glBufferData(GL_UNIFORM_BUFFER, 1024*1024, NULL, GL_DYNAMIC_DRAW);
glBufferData(GL_UNIFORM_BUFFER, 1024 * 1024, NULL, GL_DYNAMIC_DRAW);
glBindBufferBase(GL_UNIFORM_BUFFER, 2, UBOBuffers[1]);
}
void ProgramShaderCache::Shutdown(void)
@ -185,6 +186,7 @@ namespace OGL
for (; iter != pshaders.end(); iter++)
iter->second.Destroy();
pshaders.clear();
glDeleteBuffers(2, UBOBuffers);
}
}