From bc789ba53506c8c8e33d28b6c1af6c2ac0ef04c9 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 13 Mar 2023 17:26:19 +0000
Subject: [PATCH] Fix D3D12 RTV formats not being set for float case on MSAA
 conversion

---
 renderdoc/driver/d3d12/d3d12_msaa_array_conv.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_msaa_array_conv.cpp b/renderdoc/driver/d3d12/d3d12_msaa_array_conv.cpp
index 2d2b81a72..af04b4f7f 100644
--- a/renderdoc/driver/d3d12/d3d12_msaa_array_conv.cpp
+++ b/renderdoc/driver/d3d12/d3d12_msaa_array_conv.cpp
@@ -48,6 +48,10 @@ rdcpair<ID3D12PipelineState *, ID3D12PipelineState *> D3D12DebugManager::GetMSTo
     pipeDesc.PS.BytecodeLength = m_FloatMS2Array->GetBufferSize();
     pipeDesc.PS.pShaderBytecode = m_FloatMS2Array->GetBufferPointer();
 
+    pipeDesc.NumRenderTargets = 1;
+    pipeDesc.RTVFormats[0] = format;
+    pipeDesc.DSVFormat = DXGI_FORMAT_UNKNOWN;
+
     if(IsDepthFormat(format))
     {
       pipeDesc.PS.BytecodeLength = m_DepthMS2Array->GetBufferSize();
@@ -61,9 +65,6 @@ rdcpair<ID3D12PipelineState *, ID3D12PipelineState *> D3D12DebugManager::GetMSTo
     }
     else if(IsUIntFormat(format) || IsIntFormat(format))
     {
-      pipeDesc.NumRenderTargets = 1;
-      pipeDesc.RTVFormats[0] = format;
-      pipeDesc.DSVFormat = DXGI_FORMAT_UNKNOWN;
       pipeDesc.PS.BytecodeLength = m_IntMS2Array->GetBufferSize();
       pipeDesc.PS.pShaderBytecode = m_IntMS2Array->GetBufferPointer();
     }