From 7734a3622806c6bab62fe4822bdf50a0f4fcf438 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 17 Sep 2025 11:26:08 +0100 Subject: [PATCH] Fix shader clears to properly reset all labels --- .../PipelineState/D3D11PipelineStateViewer.cpp | 1 + .../PipelineState/D3D12PipelineStateViewer.cpp | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index 5290ba8f4..e9c3e113a 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -1085,6 +1085,7 @@ void D3D11PipelineStateViewer::clearShaderState(RDLabel *shader, RDLabel *shader RDTreeWidget *cbuffer, RDTreeWidget *sub) { shader->setText(ToQStr(ResourceId())); + shaderDebug->setText(QString()); tex->clear(); samp->clear(); sub->clear(); diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index 565d83915..9aaaab972 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -1040,14 +1040,13 @@ void D3D12PipelineStateViewer::setNewMeshPipeFlow() ui->pipeFlow->setIsolatedStage(5); // compute shader isolated } -void D3D12PipelineStateViewer::clearShaderState(RDLabel *shader, RDLabel *shaderDebug, - RDLabel *rootSig, RDTreeWidget *tex, - RDTreeWidget *samp, RDTreeWidget *cbuffer, - RDTreeWidget *sub) +void D3D12PipelineStateViewer::clearShaderState(RDLabel *pipeline, RDLabel *shader, RDLabel *rootSig, + RDTreeWidget *tex, RDTreeWidget *samp, + RDTreeWidget *cbuffer, RDTreeWidget *sub) { rootSig->setText(ToQStr(ResourceId())); - shader->setText(ToQStr(ResourceId())); - shaderDebug->hide(); + pipeline->setText(ToQStr(ResourceId())); + shader->hide(); tex->clear(); samp->clear(); sub->clear();