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

Give better default names to unnamed global variables

Browse Source
This commit is contained in:
baldurk
2020-04-14 18:25:55 +01:00
parent 8e082ae109
commit 59688bfc4e
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+36 -6
View File
@@ -286,6 +286,17 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
rdcstr sourceName = GetHumanName(v.id);
// if we don't have a good human name, generate a better one using the interface information
// we have
if(sourceName == var.name)
{
if(decorations[v.id].flags & Decorations::HasBuiltIn)
sourceName = StringFormat::Fmt("_%s", ToStr(decorations[v.id].builtIn).c_str());
else if(decorations[v.id].flags & Decorations::HasLocation)
sourceName =
StringFormat::Fmt("_%s%u", isInput ? "input" : "output", decorations[v.id].location);
}
size_t oldSize = globalSourceVars.size();
const DataType &type = dataTypes[v.type];
@@ -324,9 +335,7 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
ShaderVariable var;
var.name = GetRawName(v.id);
rdcstr sourceName = strings[v.id];
if(sourceName.empty())
sourceName = var.name;
rdcstr sourceName = GetHumanName(v.id);
const DataType &type = dataTypes[v.type];
@@ -341,6 +350,14 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
}
else if(innertype.type == DataType::StructType)
{
// if we don't have a good human name, generate a better one using the interface information
// we have
if(sourceName == var.name)
{
sourceName = StringFormat::Fmt("_cbuffer_set%u_bind%u", decorations[v.id].set,
decorations[v.id].binding);
}
uint32_t offset = 0;
AllocateVariable(decorations[v.id], decorations[v.id], DebugVariableType::Constant,
sourceName, 0, innertype, var);
@@ -371,9 +388,7 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
var.columns = 1;
var.name = GetRawName(v.id);
rdcstr sourceName = strings[v.id];
if(sourceName.empty())
sourceName = var.name;
rdcstr sourceName = GetHumanName(v.id);
const DataType &type = dataTypes[v.type];
@@ -382,6 +397,21 @@ ShaderDebugTrace *Debugger::BeginDebug(DebugAPIWrapper *apiWrapper, const Shader
const DataType &innertype = dataTypes[type.InnerType()];
// if we don't have a good human name, generate a better one using the interface information
// we have
if(sourceName == var.name)
{
rdcstr innerName;
if(innertype.type == DataType::SamplerType)
innerName = "sampler";
else if(innertype.type == DataType::SampledImageType)
innerName = "sampledImage";
else if(innertype.type == DataType::ImageType)
innerName = "image";
sourceName = StringFormat::Fmt("_%s_set%u_bind%u", innerName.c_str(), decorations[v.id].set,
decorations[v.id].binding);
}
DebugVariableType debugType = DebugVariableType::ReadOnlyResource;
uint32_t set = 0, bind = 0;