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

Reflect inner type for structured buffers on DXIL

Browse Source
This commit is contained in:
baldurk
2020-06-19 14:18:56 +01:00
parent a550521bd5
commit d6ef32c5d0
1 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_reflect.cpp
+35 -4
View File
@@ -433,10 +433,18 @@ static DXBC::CBufferVariableType MakeCBufferVariableType(const TypeInfo &typeInf
ret.descriptor.name = t->name;
ret.descriptor.varType = VarType::Unknown;
ret.descriptor.varClass = CLASS_STRUCT;
if(ret.descriptor.name.beginsWith("struct."))
ret.descriptor.name.erase(0, 7);
if(ret.descriptor.name.beginsWith("class."))
ret.descriptor.name.erase(0, 6);
char alignmentPrefix[] = "dx.alignment.legacy.";
if(ret.descriptor.name.beginsWith(alignmentPrefix))
ret.descriptor.name.erase(0, sizeof(alignmentPrefix) - 1);
char structPrefix[] = "struct.";
if(ret.descriptor.name.beginsWith(structPrefix))
ret.descriptor.name.erase(0, sizeof(structPrefix) - 1);
char classPrefix[] = "class.";
if(ret.descriptor.name.beginsWith(classPrefix))
ret.descriptor.name.erase(0, sizeof(classPrefix) - 1);
// if there are no members, return straight away
if(t->members.empty())
@@ -455,6 +463,29 @@ static DXBC::CBufferVariableType MakeCBufferVariableType(const TypeInfo &typeInf
return ret;
}
if(ret.descriptor.name.contains("StructuredBuffer<"))
{
// silently go into the inner member that's declared in this type as we only care about
// reflecting that actual structure
if(t->members.size() == 1 && it->second.members.size() == 1 && it->second.members[0].name == "h")
return MakeCBufferVariableType(typeInfo, t->members[0]);
RDCWARN("Structured buffer declaration found but expected single inner handle");
// otherwise use it as-is and trim off the name in an attempt to make it look normal
ret.descriptor.name.trim();
// remove any outer definition of the type
if(ret.descriptor.name.back() == '>')
ret.descriptor.name.pop_back();
else
RDCERR("Expected closing > in StructuredBuffer type name");
int idx = ret.descriptor.name.indexOf('<');
ret.descriptor.name.erase(0, idx + 1);
}
for(size_t i = 0; i < t->members.size(); i++)
{
CBufferVariable var;