D3D12: Fix out of bounds root parameter index when per-pixel lighting…

… is disabled
dolphin-emu · Jan 15, 2025 · 508a7b6 · 508a7b6
1 parent 3ea870e
commit 508a7b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Source/Core/VideoBackends/D3D12/D3D12Gfx.cpp b/Source/Core/VideoBackends/D3D12/D3D12Gfx.cpp
@@ -578,9 +578,8 @@ bool Gfx::ApplyState()
 
     if (dirty_bits & DirtyState_PS_CUS_CBV)
     {
-      cmdlist->SetGraphicsRootConstantBufferView(
-          g_ActiveConfig.bBBoxEnable ? ROOT_PARAMETER_PS_CUS_CBV : ROOT_PARAMETER_PS_CBV2,
-          m_state.constant_buffers[2]);
+      cmdlist->SetGraphicsRootConstantBufferView(ROOT_PARAMETER_PS_CUS_CBV,
+                                                 m_state.constant_buffers[2]);
     }
 
     if (dirty_bits & DirtyState_VS_SRV_Descriptor && UsesDynamicVertexLoader(pipeline))

diff --git a/Source/Core/VideoBackends/D3D12/DX12Context.cpp b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
@@ -370,6 +370,9 @@ bool DXContext::CreateGXRootSignature()
   SetRootParamConstant(&params[param_count], 4, 1, D3D12_SHADER_VISIBILITY_VERTEX);
   param_count++;
 
+  SetRootParamCBV(&params[param_count], 2, D3D12_SHADER_VISIBILITY_PIXEL);
+  param_count++;
+
   // Since these must be contiguous, pixel lighting goes to bbox if not enabled.
   if (g_ActiveConfig.bBBoxEnable)
   {
@@ -383,9 +386,6 @@ bool DXContext::CreateGXRootSignature()
     param_count++;
   }
 
-  SetRootParamCBV(&params[param_count], 2, D3D12_SHADER_VISIBILITY_PIXEL);
-  param_count++;
-
   return BuildRootSignature(m_device.Get(), &m_gx_root_signature, params.data(), param_count);
 }
 

diff --git a/Source/Core/VideoBackends/D3D12/DX12Context.h b/Source/Core/VideoBackends/D3D12/DX12Context.h
@@ -29,9 +29,9 @@ enum ROOT_PARAMETER
   ROOT_PARAMETER_GS_CBV,
   ROOT_PARAMETER_VS_SRV,
   ROOT_PARAMETER_BASE_VERTEX_CONSTANT,
+  ROOT_PARAMETER_PS_CUS_CBV,
   ROOT_PARAMETER_PS_UAV_OR_CBV2,
   ROOT_PARAMETER_PS_CBV2,     // ROOT_PARAMETER_PS_UAV_OR_CBV2 if bbox is not enabled
-  ROOT_PARAMETER_PS_CUS_CBV,  // ROOT_PARAMETER_PS_CBV2 if bbox is not enabled
   NUM_ROOT_PARAMETERS
 };
 // Compute shader root parameters