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

Actually handle serialised case of program=0 on replay

Browse Source
This commit is contained in:
baldurk
2015-04-26 21:04:49 +02:00
parent ab876ad78f
commit 88da82baa7
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_driver.h
-1
View File
@@ -281,7 +281,6 @@ class WrappedOpenGL : public IFrameCapturer
GLbitfield use;
};
vector<ProgramUse> programs;
ResourceId stagePrograms[6];
ResourceId stageShaders[6];
};
renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp
+38 -19
View File
@@ -851,33 +851,52 @@ bool WrappedOpenGL::Serialise_glUseProgramStages(GLuint pipeline, GLbitfield sta
if(m_State < WRITING)
{
ResourceId livePipeId = GetResourceManager()->GetLiveID(pipe);
ResourceId liveProgId = GetResourceManager()->GetLiveID(prog);
PipelineData &pipeDetails = m_Pipelines[livePipeId];
ProgramData &progDetails = m_Programs[liveProgId];
pipeDetails.programs.push_back(PipelineData::ProgramUse(liveProgId, Stages));
for(size_t s=0; s < 6; s++)
if(prog != ResourceId())
{
if(Stages & ShaderBit(s))
ResourceId livePipeId = GetResourceManager()->GetLiveID(pipe);
ResourceId liveProgId = GetResourceManager()->GetLiveID(prog);
PipelineData &pipeDetails = m_Pipelines[livePipeId];
ProgramData &progDetails = m_Programs[liveProgId];
for(size_t s=0; s < 6; s++)
{
for(size_t sh=0; sh < progDetails.shaders.size(); sh++)
if(Stages & ShaderBit(s))
{
if(m_Shaders[ progDetails.shaders[sh] ].type == ShaderEnum(s))
for(size_t sh=0; sh < progDetails.shaders.size(); sh++)
{
pipeDetails.stagePrograms[s] = liveProgId;
pipeDetails.stageShaders[s] = progDetails.shaders[sh];
break;
if(m_Shaders[ progDetails.shaders[sh] ].type == ShaderEnum(s))
{
pipeDetails.stagePrograms[s] = liveProgId;
pipeDetails.stageShaders[s] = progDetails.shaders[sh];
break;
}
}
}
}
m_Real.glUseProgramStages(GetResourceManager()->GetLiveResource(pipe).name,
Stages,
GetResourceManager()->GetLiveResource(prog).name);
}
else
{
ResourceId livePipeId = GetResourceManager()->GetLiveID(pipe);
PipelineData &pipeDetails = m_Pipelines[livePipeId];
for(size_t s=0; s < 6; s++)
{
if(Stages & ShaderBit(s))
{
pipeDetails.stagePrograms[s] = ResourceId();
pipeDetails.stageShaders[s] = ResourceId();
}
}
m_Real.glUseProgramStages(GetResourceManager()->GetLiveResource(pipe).name,
Stages,
0);
}
m_Real.glUseProgramStages(GetResourceManager()->GetLiveResource(pipe).name,
Stages,
GetResourceManager()->GetLiveResource(prog).name);
}
return true;