From ba7a3224ea5488f183446e855437548e69848221 Mon Sep 17 00:00:00 2001 From: Kai Ninomiya Date: Fri, 11 Aug 2017 18:06:25 -0700 Subject: [PATCH] fix accidentally lost from #105 (#109) --- src/backend/d3d12/CommandBufferD3D12.cpp | 4 ++-- third_party/spirv-cross | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/d3d12/CommandBufferD3D12.cpp b/src/backend/d3d12/CommandBufferD3D12.cpp index 845d7f3ae1..3822c7ceb3 100644 --- a/src/backend/d3d12/CommandBufferD3D12.cpp +++ b/src/backend/d3d12/CommandBufferD3D12.cpp @@ -281,7 +281,7 @@ namespace d3d12 { if (attachmentInfo.firstSubpass == currentSubpass) { // Load op - color if (attachmentInfo.colorLoadOp == nxt::LoadOp::Clear) { - auto handle = currentFramebuffer->GetDSVDescriptor(attachmentSlot); + auto handle = currentFramebuffer->GetRTVDescriptor(attachmentSlot); const auto& clear = currentFramebuffer->GetClearColor(attachmentSlot); commandList->ClearRenderTargetView(handle, clear.color, 0, nullptr); } @@ -308,7 +308,7 @@ namespace d3d12 { clearFlags |= D3D12_CLEAR_FLAG_STENCIL; } if (clearFlags) { - auto handle = currentFramebuffer->GetRTVDescriptor(attachmentSlot); + auto handle = currentFramebuffer->GetDSVDescriptor(attachmentSlot); const auto& clear = currentFramebuffer->GetClearDepthStencil(attachmentSlot); // TODO(kainino@chromium.org): investigate: should the NXT clear stencil type be uint8_t? uint8_t clearStencil = static_cast(clear.stencil); diff --git a/third_party/spirv-cross b/third_party/spirv-cross index e8eae4d7dd..2cbeaac76f 160000 --- a/third_party/spirv-cross +++ b/third_party/spirv-cross @@ -1 +1 @@ -Subproject commit e8eae4d7dde433b1a8dc7e9a977508f8cef9c984 +Subproject commit 2cbeaac76f6fac04f077a6aea2bd1417909798f3