From 673caa32a75e1078d8e3dc44ce77bf926844bf09 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Mon, 17 Mar 2025 16:54:39 +0000 Subject: [PATCH] Add the input variables to DXIL debugger sourcevars --- renderdoc/driver/shaders/dxil/dxil_debug.cpp | 32 +------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp index 6bb494430..79b77dfdd 100644 --- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp +++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp @@ -8274,6 +8274,7 @@ ShaderDebugTrace *Debugger::BeginDebug(uint32_t eventId, const DXBC::DXBCContain ref.name = inStruct.name + "." + v.name; inputMapping.variables.push_back(ref); } + ret->sourceVars.push_back(inputMapping); } // Make a single source variable mapping for the whole input struct @@ -8434,37 +8435,6 @@ ShaderDebugTrace *Debugger::BeginDebug(uint32_t eventId, const DXBC::DXBCContain ret->sourceVars.push_back(outputMapping); } - // Per instruction all source variable mappings at this instruction (cumulative and complete) - // InstructionSourceInfo - // { - // uint32_t instruction; - // LineColumnInfo lineInfo; - // { - // uint32_t disassemblyLine = 0; - // int32_t fileIndex = -1; - // uint32_t lineStart = 0; - // uint32_t lineEnd = 0; - // uint32_t colStart = 0; - // uint32_t colEnd = 0; - // } - // rdcarray sourceVars; - // { - // rdcstr name; - // VarType type = VarType::Unknown; - // uint32_t rows = 0; - // uint32_t columns = 0; - // uint32_t offset; - // int32_t signatureIndex = -1; - // rdcarray variables; - // { - // rdcstr name; - // DebugVariableType type = DebugVariableType::Undefined; - // uint32_t component = 0; - // } - // } - // } - // ret->instInfo.push_back(InstructionSourceInfo()) - ret->inputs = {state.m_Input}; ret->inputs.append(state.m_Input.members); ret->constantBlocks = m_GlobalState.constantBlocks;