lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-13 05:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix serialising program array uniforms.

Browse Source
This commit is contained in:
baldurk
2014-12-01 18:13:28 +00:00
parent 04c2bba23f
commit 3dfa8f17ab
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.cpp
+10 -2
View File
@@ -480,7 +480,6 @@ static void ForAllProgramUniforms(const GLHookSet &gl, Serialiser *ser, GLuint p
char n[1024] = {0};
gl.glGetProgramResourceName(progSrc, eGL_UNIFORM, i, values[2], NULL, n);
basename = n;
if(arraySize > 1)
{
@@ -495,13 +494,14 @@ static void ForAllProgramUniforms(const GLHookSet &gl, Serialiser *ser, GLuint p
{
arraySize = 1;
}
basename = n;
}
if(SerialiseUniforms)
{
ser->Serialise("type", type);
ser->Serialise("arraySize", arraySize);
ser->Serialise("srcLocation", srcLocation);
ser->Serialise("basename", basename);
ser->Serialise("isArray", isArray);
}
@@ -516,8 +516,16 @@ static void ForAllProgramUniforms(const GLHookSet &gl, Serialiser *ser, GLuint p
string name = basename;
if(isArray)
{
name += StringFormat::Fmt("[%d]", arr);
if(ReadSourceProgram)
srcLocation = gl.glGetUniformLocation(progDst, name.c_str());
}
if(SerialiseUniforms)
ser->Serialise("srcLocation", srcLocation);
GLint newloc = 0;
if(WriteDestProgram)
{