ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 64514bd8d4 into 795e78685f

This commit is contained in:
Pokechu22 2025-01-18 00:17:44 +01:00 committed by GitHub
parent 795e78685f 64514bd8d4
commit 73a090a3a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoBackends/D3D12/D3D12Gfx.cpp
View File

@ -578,9 +578,8 @@ bool Gfx::ApplyState()
if (dirty_bits & DirtyState_PS_CUS_CBV) if (dirty_bits & DirtyState_PS_CUS_CBV)
{ {
cmdlist->SetGraphicsRootConstantBufferView( cmdlist->SetGraphicsRootConstantBufferView(ROOT_PARAMETER_PS_CUS_CBV,
g_ActiveConfig.bBBoxEnable ? ROOT_PARAMETER_PS_CUS_CBV : ROOT_PARAMETER_PS_CBV2, m_state.constant_buffers[2]);
m_state.constant_buffers[2]);
} }
if (dirty_bits & DirtyState_VS_SRV_Descriptor && UsesDynamicVertexLoader(pipeline)) if (dirty_bits & DirtyState_VS_SRV_Descriptor && UsesDynamicVertexLoader(pipeline))

6
Source/Core/VideoBackends/D3D12/DX12Context.cpp
View File

@ -370,6 +370,9 @@ bool DXContext::CreateGXRootSignature()
SetRootParamConstant(&params[param_count], 4, 1, D3D12_SHADER_VISIBILITY_VERTEX); SetRootParamConstant(&params[param_count], 4, 1, D3D12_SHADER_VISIBILITY_VERTEX);
param_count++; 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. // Since these must be contiguous, pixel lighting goes to bbox if not enabled.
if (g_ActiveConfig.bBBoxEnable) if (g_ActiveConfig.bBBoxEnable)
{ {
@ -383,9 +386,6 @@ bool DXContext::CreateGXRootSignature()
param_count++; 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); return BuildRootSignature(m_device.Get(), &m_gx_root_signature, params.data(), param_count);
} }

4
Source/Core/VideoBackends/D3D12/DX12Context.h
View File

@ -29,9 +29,9 @@ enum ROOT_PARAMETER
ROOT_PARAMETER_GS_CBV, ROOT_PARAMETER_GS_CBV,
ROOT_PARAMETER_VS_SRV, ROOT_PARAMETER_VS_SRV,
ROOT_PARAMETER_BASE_VERTEX_CONSTANT, ROOT_PARAMETER_BASE_VERTEX_CONSTANT,
ROOT_PARAMETER_PS_CUS_CBV,
ROOT_PARAMETER_PS_UAV_OR_CBV2, ROOT_PARAMETER_PS_UAV_OR_CBV2,
ROOT_PARAMETER_PS_CBV2, // ROOT_PARAMETER_PS_UAV_OR_CBV2 if bbox is not enabled 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 NUM_ROOT_PARAMETERS
}; };
// Compute shader root parameters // Compute shader root parameters