From de7f9d8e1ca597d35b23f7717336fb36ee4a9e1c Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 13 Feb 2020 16:04:06 +0000 Subject: [PATCH] Remove hasSourceMapping from ShaderDebugTrace * We expect to always have source mapping, from reflection data if nothing else. --- qrenderdoc/Windows/ShaderViewer.cpp | 34 +++++++------------- renderdoc/api/replay/shader_types.h | 3 -- renderdoc/driver/d3d11/d3d11_shaderdebug.cpp | 3 -- renderdoc/driver/d3d12/d3d12_shaderdebug.cpp | 4 --- renderdoc/replay/renderdoc_serialise.inl | 3 +- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 4802d7dd6..e5e136810 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -516,28 +516,19 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR ui->docking->setToolWindowProperties( ui->constants, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow); - if(m_Trace->hasSourceMapping) - { - ui->callstack->setWindowTitle(tr("Callstack")); - ui->docking->addToolWindow( - ui->callstack, ToolWindowManager::AreaReference( - ToolWindowManager::RightOf, ui->docking->areaOf(ui->debugVars), 0.2f)); - ui->docking->setToolWindowProperties( - ui->callstack, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow); + ui->callstack->setWindowTitle(tr("Callstack")); + ui->docking->addToolWindow( + ui->callstack, ToolWindowManager::AreaReference(ToolWindowManager::RightOf, + ui->docking->areaOf(ui->debugVars), 0.2f)); + ui->docking->setToolWindowProperties( + ui->callstack, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow); - ui->sourceVars->setWindowTitle(tr("High-level Variables")); - ui->docking->addToolWindow( - ui->sourceVars, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, - ui->docking->areaOf(ui->debugVars))); - ui->docking->setToolWindowProperties( - ui->sourceVars, - ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow); - } - else - { - ui->callstack->hide(); - ui->sourceVars->hide(); - } + ui->sourceVars->setWindowTitle(tr("High-level Variables")); + ui->docking->addToolWindow( + ui->sourceVars, ToolWindowManager::AreaReference(ToolWindowManager::AddTo, + ui->docking->areaOf(ui->debugVars))); + ui->docking->setToolWindowProperties( + ui->sourceVars, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow); m_Line2Insts.resize(m_ShaderDetails->debugInfo.files.count()); @@ -2367,7 +2358,6 @@ void ShaderViewer::updateDebugState() } } - if(m_Trace->hasSourceMapping) { RDTreeViewExpansionState expansion; ui->sourceVars->saveExpansion(expansion, 0); diff --git a/renderdoc/api/replay/shader_types.h b/renderdoc/api/replay/shader_types.h index a02b65b05..0508fe81c 100644 --- a/renderdoc/api/replay/shader_types.h +++ b/renderdoc/api/replay/shader_types.h @@ -678,9 +678,6 @@ If this is ``None`` then the trace is invalid. )"); ShaderDebugger *debugger = NULL; - DOCUMENT("A flag indicating whether this trace has source-variable mapping information"); - bool hasSourceMapping = false; - DOCUMENT(R"(A ``list`` of :class:`LineColumnInfo` detailing which source lines each instruction corresponds to )"); diff --git a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp index 41a7e437d..b6591daf6 100644 --- a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp +++ b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp @@ -2115,7 +2115,6 @@ ShaderDebugTrace *D3D11Replay::DebugVertex(uint32_t eventId, uint32_t vertid, ui ret->constantBlocks = global.constantBlocks; ret->inputs = state.inputs; - ret->hasSourceMapping = dxbc->GetDebugInfo() && dxbc->GetDebugInfo()->HasSourceMapping(); delete[] instData; @@ -2867,7 +2866,6 @@ void ExtractInputsPS(PSInput IN, float4 debug_pixelPos : SV_Position, ret->inputs = state.inputs; ret->constantBlocks = global.constantBlocks; - ret->hasSourceMapping = dxbc->GetDebugInfo() && dxbc->GetDebugInfo()->HasSourceMapping(); SAFE_DELETE_ARRAY(initialData); SAFE_DELETE_ARRAY(evalData); @@ -2924,7 +2922,6 @@ ShaderDebugTrace *D3D11Replay::DebugThread(uint32_t eventId, const uint32_t grou } ret->constantBlocks = global.constantBlocks; - ret->hasSourceMapping = dxbc->GetDebugInfo() && dxbc->GetDebugInfo()->HasSourceMapping(); dxbc->FillTraceLineInfo(*ret); diff --git a/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp b/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp index fdf7dc071..7e0978117 100644 --- a/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp +++ b/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp @@ -1684,8 +1684,6 @@ void ExtractInputsPS(PSInput IN, float4 debug_pixelPos : SV_Position, ret->constantBlocks = global.constantBlocks; ret->inputs = state.inputs; - ret->hasSourceMapping = dxbc->GetDebugInfo() && dxbc->GetDebugInfo()->HasSourceMapping(); - dxbc->FillTraceLineInfo(*ret); return ret; @@ -1744,8 +1742,6 @@ ShaderDebugTrace *D3D12Replay::DebugThread(uint32_t eventId, const uint32_t grou ret->constantBlocks = global.constantBlocks; - ret->hasSourceMapping = dxbc->GetDebugInfo() && dxbc->GetDebugInfo()->HasSourceMapping(); - dxbc->FillTraceLineInfo(*ret); // add fake inputs for semantics diff --git a/renderdoc/replay/renderdoc_serialise.inl b/renderdoc/replay/renderdoc_serialise.inl index 7e048107d..c5808dcc3 100644 --- a/renderdoc/replay/renderdoc_serialise.inl +++ b/renderdoc/replay/renderdoc_serialise.inl @@ -407,7 +407,6 @@ void DoSerialise(SerialiserType &ser, ShaderDebugTrace &el) SERIALISE_MEMBER(readWriteResources); SERIALISE_MEMBER(sourceVars); SERIALISE_MEMBER(lineInfo); - SERIALISE_MEMBER(hasSourceMapping); // serialise the debugger pointer entirely opaquely, this is only used for replay proxying uint64_t debugger = 0; @@ -417,7 +416,7 @@ void DoSerialise(SerialiserType &ser, ShaderDebugTrace &el) if(ser.IsReading()) el.debugger = (ShaderDebugger *)debugger; - SIZE_CHECK(160); + SIZE_CHECK(152); } template