From 072bd7f7de2c5c41defb73ef8e755ffae2d4837c Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 26 Oct 2022 08:28:51 -0700 Subject: Fix d3d debug layer error on setting clear value. (#2458) --- tools/gfx/d3d12/d3d12-device.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/gfx/d3d12/d3d12-device.cpp b/tools/gfx/d3d12/d3d12-device.cpp index dbc2a18d9..c87e6b4ca 100644 --- a/tools/gfx/d3d12/d3d12-device.cpp +++ b/tools/gfx/d3d12/d3d12-device.cpp @@ -942,6 +942,14 @@ Result DeviceImpl::createTextureResource( D3D12_CLEAR_VALUE clearValue; D3D12_CLEAR_VALUE* clearValuePtr = nullptr; + clearValue.Format = resourceDesc.Format; + if (descIn.optimalClearValue) + { + memcpy(clearValue.Color, &descIn.optimalClearValue->color, sizeof(clearValue.Color)); + clearValue.DepthStencil.Depth = descIn.optimalClearValue->depthStencil.depth; + clearValue.DepthStencil.Stencil = descIn.optimalClearValue->depthStencil.stencil; + clearValuePtr = &clearValue; + } if ((resourceDesc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) == 0) { @@ -951,14 +959,6 @@ Result DeviceImpl::createTextureResource( { clearValuePtr = nullptr; } - clearValue.Format = resourceDesc.Format; - if (descIn.optimalClearValue) - { - memcpy(clearValue.Color, &descIn.optimalClearValue->color, sizeof(clearValue.Color)); - clearValue.DepthStencil.Depth = descIn.optimalClearValue->depthStencil.depth; - clearValue.DepthStencil.Stencil = descIn.optimalClearValue->depthStencil.stencil; - clearValuePtr = &clearValue; - } SLANG_RETURN_ON_FAIL(texture->m_resource.initCommitted( m_device, heapProps, -- cgit v1.2.3