From d0acc2a349f917dae9cc15c8df94ea628dd23564 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 23 Jul 2021 16:24:16 +0100 Subject: [PATCH] Fix display of typed buffers in D3D pipeline state viewer --- qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp | 2 +- qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index 2860314ea..c5b843a9f 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -771,7 +771,7 @@ void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, d = 0; a = 0; format = QString(); - typeName = lit("Buffer"); + typeName = QFormatStr("%1Buffer").arg(view.type == D3D11ViewTag::UAV ? lit("RW") : QString()); if(r.bufferFlags & D3DBufferViewFlags::Raw) { diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index 2adb1f8cd..cbac73b31 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -802,13 +802,13 @@ void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, const Bi d = 0; a = 0; format = QString(); - typeName = lit("Buffer"); + typeName = QFormatStr("%1Buffer").arg(uav ? lit("RW") : QString()); if(r.bufferFlags & D3DBufferViewFlags::Raw) { typeName = QFormatStr("%1ByteAddressBuffer").arg(uav ? lit("RW") : QString()); } - else if(r.elementByteSize > 0) + else if(r.elementByteSize > 0 && r.viewFormat.type == ResourceFormatType::Undefined) { // for structured buffers, display how many 'elements' there are in the buffer a = buf->length / r.elementByteSize;