mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-03 22:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d12: Fix color masking

Browse Source 
Wasn't using the correct PSO state variable
This commit is contained in:
vlj 2015-06-08 19:33:41 +02:00 committed by Vincent Lejeune
parent 724159c8b4
commit dc1a57e71c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
View File

@ -275,9 +275,15 @@ bool D3D12GSRender::LoadProgram()
} }
if (m_set_color_mask) if (m_set_color_mask)
prop.SampleMask = m_color_mask_r | (m_color_mask_g << 1) | (m_color_mask_b << 2) | (m_color_mask_a << 3); {
else UINT8 mask = 0;
prop.SampleMask = UINT_MAX; mask |= m_color_mask_r ? D3D12_COLOR_WRITE_ENABLE_RED : 0;
mask |= m_color_mask_g ? D3D12_COLOR_WRITE_ENABLE_GREEN : 0;
mask |= m_color_mask_b ? D3D12_COLOR_WRITE_ENABLE_BLUE : 0;
mask |= m_color_mask_a ? D3D12_COLOR_WRITE_ENABLE_ALPHA : 0;
for (unsigned i = 0; i < prop.numMRT; i++)
prop.Blend.RenderTarget[i].RenderTargetWriteMask = mask;
}
prop.IASet = m_IASet; prop.IASet = m_IASet;

5
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
View File

@ -20,7 +20,6 @@ struct D3D12PipelineProperties
unsigned numMRT : 3; unsigned numMRT : 3;
D3D12_DEPTH_STENCIL_DESC DepthStencil; D3D12_DEPTH_STENCIL_DESC DepthStencil;
D3D12_RASTERIZER_DESC Rasterization; D3D12_RASTERIZER_DESC Rasterization;
UINT SampleMask;
bool operator==(const D3D12PipelineProperties &in) const bool operator==(const D3D12PipelineProperties &in) const
{ {
@ -47,7 +46,7 @@ struct D3D12PipelineProperties
return false; return false;
if (memcmp(&Rasterization, &in.Rasterization, sizeof(D3D12_RASTERIZER_DESC))) if (memcmp(&Rasterization, &in.Rasterization, sizeof(D3D12_RASTERIZER_DESC)))
return false; return false;
return Topology == in.Topology && DepthStencilFormat == in.DepthStencilFormat && numMRT == in.numMRT && SampleMask == in.SampleMask && RenderTargetsFormat == in.RenderTargetsFormat; return Topology == in.Topology && DepthStencilFormat == in.DepthStencilFormat && numMRT == in.numMRT && RenderTargetsFormat == in.RenderTargetsFormat;
} }
}; };
@ -162,7 +161,7 @@ struct D3D12Traits
graphicPipelineStateDesc.InputLayout.pInputElementDescs = pipelineProperties.IASet.data(); graphicPipelineStateDesc.InputLayout.pInputElementDescs = pipelineProperties.IASet.data();
graphicPipelineStateDesc.InputLayout.NumElements = (UINT)pipelineProperties.IASet.size(); graphicPipelineStateDesc.InputLayout.NumElements = (UINT)pipelineProperties.IASet.size();
graphicPipelineStateDesc.SampleDesc.Count = 1; graphicPipelineStateDesc.SampleDesc.Count = 1;
graphicPipelineStateDesc.SampleMask = pipelineProperties.SampleMask; graphicPipelineStateDesc.SampleMask = UINT_MAX;
graphicPipelineStateDesc.NodeMask = 1; graphicPipelineStateDesc.NodeMask = 1;
extraData.first->CreateGraphicsPipelineState(&graphicPipelineStateDesc, IID_PPV_ARGS(&result->first)); extraData.first->CreateGraphicsPipelineState(&graphicPipelineStateDesc, IID_PPV_ARGS(&result->first));