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

Handle SPIR-V with empty and file contents source directives

Browse Source 
* This can happen if e.g. there's an OpSource with no contents, and then a
  DebugSource with contents.
This commit is contained in:
baldurk
2024-03-01 12:11:24 +00:00
parent 3e2340fe16
commit 755291ad47
2 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_reflect.cpp
+62 -35
View File
@@ -621,13 +621,26 @@ void Reflector::RegisterOp(Iter it)
}
}
sources.push_back({source.sourceLanguage, strings[source.file], source.source});
sourceLanguage = source.sourceLanguage;
// don't add empty source statements as actual files
if(!source.source.empty())
{
rdcstr name = strings[source.file];
if(name.empty())
name = "unnamed_shader";
sources.push_back({name, source.source});
}
}
else if(opdata.op == Op::SourceContinued)
{
OpSourceContinued continued(it);
sources.back().contents += continued.continuedSource;
// in theory someone could do OpSource with no source then OpSourceContinued. We treat this mostly
// as garbage-in, garbage-out, but just in case we have no files don't crash here and instead ignore it.
if(!sources.empty())
sources.back().contents += continued.continuedSource;
}
else if(opdata.op == Op::Label)
{
@@ -647,23 +660,37 @@ void Reflector::RegisterOp(Iter it)
{
if(dbg.inst == ShaderDbg::Source)
{
debugSources[dbg.result] = sources.size();
sources.push_back({
SourceLanguage::Unknown,
strings[dbg.arg<Id>(0)],
dbg.params.size() > 1 ? strings[dbg.arg<Id>(1)] : rdcstr(),
});
rdcstr name = strings[dbg.arg<Id>(0)];
if(name.empty())
name = "unnamed_shader";
rdcstr source = dbg.params.size() > 1 ? strings[dbg.arg<Id>(1)] : rdcstr();
// don't add empty source statements as actual files
if(!source.empty())
{
debugSources[dbg.result] = sources.size();
sources.push_back({name, source});
}
}
else if(dbg.inst == ShaderDbg::SourceContinued)
{
sources.back().contents += strings[dbg.arg<Id>(0)];
// in theory someone could do OpSource with no source then OpSourceContinued. We treat this
// mostly as garbage-in, garbage-out, but just in case we have no files don't crash here and
// instead ignore it.
if(!sources.empty())
sources.back().contents += strings[dbg.arg<Id>(0)];
}
else if(dbg.inst == ShaderDbg::Function)
{
LineColumnInfo &info = debugFuncToLocation[dbg.result];
info.fileIndex = (int32_t)debugSources[dbg.arg<Id>(2)];
info.lineStart = info.lineEnd = EvaluateConstant(dbg.arg<Id>(3), {}).value.u32v[0];
// check this source file exists - we won't have registered it if there was no source code
auto srcit = debugSources.find(dbg.arg<Id>(2));
if(srcit != debugSources.end())
{
info.fileIndex = (int32_t)srcit->second;
info.lineStart = info.lineEnd = EvaluateConstant(dbg.arg<Id>(3), {}).value.u32v[0];
}
}
else if(dbg.inst == ShaderDbg::FunctionDefinition)
{
@@ -671,10 +698,11 @@ void Reflector::RegisterOp(Iter it)
}
else if(dbg.inst == ShaderDbg::CompilationUnit)
{
sources[debugSources[dbg.arg<Id>(2)]].lang =
(SourceLanguage)EvaluateConstant(dbg.arg<Id>(3), {}).value.u32v[0];
sourceLanguage = (SourceLanguage)EvaluateConstant(dbg.arg<Id>(3), {}).value.u32v[0];
compUnitToFileIndex[dbg.result] = debugSources[dbg.arg<Id>(2)];
auto srcit = debugSources.find(dbg.arg<Id>(2));
if(srcit != debugSources.end())
compUnitToFileIndex[dbg.result] = srcit->second;
}
else if(dbg.inst == ShaderDbg::EntryPoint)
{
@@ -947,29 +975,28 @@ void Reflector::MakeReflection(const GraphicsAPI sourceAPI, const ShaderStage st
reflection.dispatchThreadsDimension[2] = 0;
}
switch(sourceLanguage)
{
case SourceLanguage::ESSL:
case SourceLanguage::GLSL: reflection.debugInfo.encoding = ShaderEncoding::GLSL; break;
case SourceLanguage::HLSL: reflection.debugInfo.encoding = ShaderEncoding::HLSL; break;
case SourceLanguage::Slang: reflection.debugInfo.encoding = ShaderEncoding::Slang; break;
case SourceLanguage::OpenCL_C:
case SourceLanguage::OpenCL_CPP:
case SourceLanguage::CPP_for_OpenCL:
case SourceLanguage::Unknown:
case SourceLanguage::Invalid:
case SourceLanguage::SYCL:
case SourceLanguage::HERO_C:
case SourceLanguage::NZSL:
case SourceLanguage::WGSL:
case SourceLanguage::Zig:
case SourceLanguage::Max: break;
}
for(size_t i = 0; i < sources.size(); i++)
{
switch(sources[i].lang)
{
case SourceLanguage::ESSL:
case SourceLanguage::GLSL: reflection.debugInfo.encoding = ShaderEncoding::GLSL; break;
case SourceLanguage::HLSL: reflection.debugInfo.encoding = ShaderEncoding::HLSL; break;
case SourceLanguage::Slang: reflection.debugInfo.encoding = ShaderEncoding::Slang; break;
case SourceLanguage::OpenCL_C:
case SourceLanguage::OpenCL_CPP:
case SourceLanguage::CPP_for_OpenCL:
case SourceLanguage::Unknown:
case SourceLanguage::Invalid:
case SourceLanguage::SYCL:
case SourceLanguage::HERO_C:
case SourceLanguage::NZSL:
case SourceLanguage::WGSL:
case SourceLanguage::Zig:
case SourceLanguage::Max: break;
}
if(!sources[i].name.empty() || !sources[i].contents.empty())
reflection.debugInfo.files.push_back({sources[i].name, sources[i].contents});
reflection.debugInfo.files.push_back({sources[i].name, sources[i].contents});
}
switch(m_Generator)
renderdoc/driver/shaders/spirv/spirv_reflect.h
+1 -1
View File
@@ -83,7 +83,6 @@ namespace rdcspv
{
struct SourceFile
{
SourceLanguage lang;
rdcstr name;
rdcstr contents;
};
@@ -134,6 +133,7 @@ private:
rdcstr cmdline;
DenseIdMap<rdcstr> strings;
SourceLanguage sourceLanguage = SourceLanguage::Unknown;
rdcarray<SourceFile> sources;
SparseIdMap<size_t> debugSources;
SparseIdMap<size_t> compUnitToFileIndex;