lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-06 04:11:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

When in CAPFRAME save uniform sets to context record

Browse Source 
* It was the wrong way around. When not capturing frame we save uniform
  sets to the program's record, but really we shouldn't do this and we
  should grab these as 'initial state' of the program resources
This commit is contained in:
Baldur Karlsson committed 2014-06-24 15:46:22 +01:00
1 parent 6e1d976a48
commit d0b63f6ae3
1 file changed
+35 -28
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_uniform_funcs.cpp
+35 -28
View File
@@ -411,13 +411,14 @@ void WrappedOpenGL::glProgramUniform1i(GLuint program, GLint location, GLint v0)
if(m_State == WRITING_CAPFRAME)
{
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
m_ContextRecord->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
}
}
@@ -433,13 +434,14 @@ void WrappedOpenGL::glProgramUniform1iv(GLuint program, GLint location, GLsizei
if(m_State == WRITING_CAPFRAME)
{
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
m_ContextRecord->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
}
}
@@ -455,13 +457,14 @@ void WrappedOpenGL::glProgramUniform1fv(GLuint program, GLint location, GLsizei
if(m_State == WRITING_CAPFRAME)
{
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
m_ContextRecord->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
}
}
@@ -477,13 +480,14 @@ void WrappedOpenGL::glProgramUniform1uiv(GLuint program, GLint location, GLsizei
if(m_State == WRITING_CAPFRAME)
{
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
m_ContextRecord->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
}
}
@@ -499,13 +503,14 @@ void WrappedOpenGL::glProgramUniform2fv(GLuint program, GLint location, GLsizei
if(m_State == WRITING_CAPFRAME)
{
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
m_ContextRecord->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
}
}
@@ -521,13 +526,14 @@ void WrappedOpenGL::glProgramUniform3fv(GLuint program, GLint location, GLsizei
if(m_State == WRITING_CAPFRAME)
{
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
m_ContextRecord->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
}
}
@@ -543,13 +549,14 @@ void WrappedOpenGL::glProgramUniform4fv(GLuint program, GLint location, GLsizei
if(m_State == WRITING_CAPFRAME)
{
m_ContextRecord->AddChunk(scope.Get());
}
else
{
// TODO grab this at capture time as initial state for program resources
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(ProgramRes(program));
RDCASSERT(record);
record->AddChunk(scope.Get());
}
else
{
m_ContextRecord->AddChunk(scope.Get());
}
}
}