rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-03 22:24:13 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Unbind RTs which are unwritten by a PS

Browse Source 
Otherwise we can end up with feedback loops on RTs with a 0 color mask.

Closes: #3447
This commit is contained in:
Joshua Ashton 2023-05-24 13:27:53 +01:00 committed by Joshie
parent b9b2db510e
commit 8560efa3c7
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/d3d9/d3d9_device.cpp
View File

@ -3278,21 +3278,33 @@ namespace dxvk {
m_state.pixelShader = shader; m_state.pixelShader = shader;
D3D9ShaderMasks newShaderMasks;
if (shader != nullptr) { if (shader != nullptr) {
m_flags.set(D3D9DeviceFlag::DirtyFFPixelShader); m_flags.set(D3D9DeviceFlag::DirtyFFPixelShader);
BindShader<DxsoProgramTypes::PixelShader>(GetCommonShader(shader)); BindShader<DxsoProgramTypes::PixelShader>(GetCommonShader(shader));
m_psShaderMasks = newShader->GetShaderMask(); newShaderMasks = newShader->GetShaderMask();
} }
else { else {
// TODO: What fixed function textures are in use? // TODO: What fixed function textures are in use?
// Currently we are making all 8 of them as in use here. // Currently we are making all 8 of them as in use here.
// The RT output is always 0 for fixed function. // The RT output is always 0 for fixed function.
m_psShaderMasks = FixedFunctionMask; newShaderMasks = FixedFunctionMask;
} }
UpdateActiveHazardsRT(UINT32_MAX); // If we have any RTs we would have bound to the the FB
// not in the new shader mask, mark the framebuffer as dirty
// so we unbind them.
if (m_activeRTs & m_psShaderMasks.rtMask & (~newShaderMasks.rtMask))
m_flags.set(D3D9DeviceFlag::DirtyFramebuffer);
if (m_psShaderMasks.samplerMask != newShaderMasks.samplerMask ||
m_psShaderMasks.rtMask != newShaderMasks.rtMask) {
m_psShaderMasks = newShaderMasks;
UpdateActiveHazardsRT(UINT32_MAX);
}
return D3D_OK; return D3D_OK;
} }
@ -5666,6 +5678,9 @@ namespace dxvk {
if (!m_state.renderStates[ColorWriteIndex(i)]) if (!m_state.renderStates[ColorWriteIndex(i)])
continue; continue;
if (!(m_psShaderMasks.rtMask & (1 << i)))
continue;
attachments.color[i] = { attachments.color[i] = {
m_state.renderTargets[i]->GetRenderTargetView(srgb), m_state.renderTargets[i]->GetRenderTargetView(srgb),
m_state.renderTargets[i]->GetRenderTargetLayout(m_hazardLayout) }; m_state.renderTargets[i]->GetRenderTargetLayout(m_hazardLayout) };