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

Don't crash in glslang reflection fallback path if shaders don't compile

Browse Source
This commit is contained in:
baldurk
2022-12-21 23:03:39 +00:00
parent c0d4a75d52
commit 8c6566c6b8
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp
+23 -10
View File
@@ -205,8 +205,13 @@ void WrappedOpenGL::ShaderData::ProcessCompilation(WrappedOpenGL &drv, ResourceI
// if we don't have program_interface_query, need to compile the shader with glslang to be able
// to reflect with. This is needed on capture or replay
if(!HasExt[ARB_program_interface_query] && status == 1)
{
glslangShader = CompileShaderForReflection(rdcspv::ShaderStage(ShaderIdx(type)), sources);
if(glslangShader == NULL)
RDCERR("glslang shader failed to compile, reflection will fail");
}
if(IsReplayMode(drv.GetState()) && !drv.IsInternalShader())
{
// no shaders made under this point should be reflected themselves, they're only used for
@@ -249,22 +254,30 @@ void WrappedOpenGL::ShaderData::ProcessCompilation(WrappedOpenGL &drv, ResourceI
// In this case we forcibly emulate ARB_program_interface_query.
RDCASSERT(!HasExt[ARB_program_interface_query]);
// to do this, we need to create an empty program object and manually configure its glslang
// program.
GLuint fakeProgram = drv.glCreateProgram();
if(glslangShader == NULL)
{
RDCERR("Couldn't compile shader via glslang - functionality will be broken.");
}
else
{
// to do this, we need to create an empty program object and manually configure its
// glslang program.
GLuint fakeProgram = drv.glCreateProgram();
ResourceId progid = drv.GetResourceManager()->GetResID(ProgramRes(drv.GetCtx(), fakeProgram));
ResourceId progid =
drv.GetResourceManager()->GetResID(ProgramRes(drv.GetCtx(), fakeProgram));
ProgramData &progDetails = drv.m_Programs[progid];
ProgramData &progDetails = drv.m_Programs[progid];
progDetails.linked = true;
progDetails.linked = true;
progDetails.glslangProgram = LinkProgramForReflection({glslangShader});
progDetails.glslangProgram = LinkProgramForReflection({glslangShader});
MakeShaderReflection(type, fakeProgram, *reflection, outputUsage);
reflected = true;
MakeShaderReflection(type, fakeProgram, *reflection, outputUsage);
reflected = true;
drv.glDeleteProgram(fakeProgram);
drv.glDeleteProgram(fakeProgram);
}
}
if(reflected)