piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

OpenGL: drop UBO-workaround usage for efb2ram shaders

Browse Source 
It's just brainfuck to use this workaroung there. Just fetch the uniform location like all other util shaders.
This commit is contained in:
degasus
2014-01-05 09:52:26 +01:00
parent 01351795f0
commit 4fff5ac90d
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoBackends/OGL/TextureConverter.cpp
View File

@ -40,6 +40,7 @@ static SHADER s_yuyvToRgbProgram;
// Not all slots are taken - but who cares.
const u32 NUM_ENCODING_PROGRAMS = 64;
static SHADER s_encodingPrograms[NUM_ENCODING_PROGRAMS];
static int s_encodingUniforms[NUM_ENCODING_PROGRAMS];
static GLuint s_PBO = 0; // for readback with different strides
@ -156,6 +157,8 @@ SHADER &GetOrCreateEncodingShader(u32 format)
"}\n";
ProgramShaderCache::CompileShader(s_encodingPrograms[format], VProgram, shader);
s_encodingUniforms[format] = glGetUniformLocation(s_encodingPrograms[format].glprogid, "position");
}
return s_encodingPrograms[format];
}
@ -312,7 +315,7 @@ int EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer,
s32 expandedHeight = (height + blkH) & (~blkH);
texconv_shader.Bind();
glUniform4i(texconv_shader.UniformLocations[0],
glUniform4i(s_encodingUniforms[format],
source.left, source.top,
expandedWidth, bScaleByHalf ? 2 : 1);