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

dx11: enable depth writing in oit pass 

Make sure both depth attachments are identical at the end of each pass.
Issue #996
This commit is contained in:
Flyinghead 2023-03-31 20:01:12 +02:00
parent 5df9127add
commit bc4f8fbe60
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/rend/dx11/oit/dx11_oitrenderer.cpp
View File

@ -310,16 +310,14 @@ struct DX11OITRenderer : public DX11Renderer
else
zfunc = gp->isp.DepthMode;
bool zwriteEnable = false;
if (pass == DX11OITShaders::Depth || pass == DX11OITShaders::Color)
{
// Z Write Disable seems to be ignored for punch-through.
// Fixes Worms World Party, Bust-a-Move 4 and Re-Volt
if (Type == ListType_Punch_Through)
zwriteEnable = true;
else
zwriteEnable = !gp->isp.ZWriteDis;
}
bool zwriteEnable;
// Z Write Disable seems to be ignored for punch-through.
// Fixes Worms World Party, Bust-a-Move 4 and Re-Volt
if (Type == ListType_Punch_Through)
zwriteEnable = true;
else
zwriteEnable = !gp->isp.ZWriteDis;
bool needStencil = config::ModifierVolumes && pass == DX11OITShaders::Depth && Type != ListType_Translucent;
const u32 stencil = (gp->pcw.Shadow != 0) ? 0x80 : 0;
deviceContext->OMSetDepthStencilState(depthStencilStates.getState(true, zwriteEnable, zfunc, needStencil), stencil);
@ -532,8 +530,8 @@ struct DX11OITRenderer : public DX11Renderer
// PASS 1: Geometry pass to update depth and stencil
//
// unbind depth/stencil
ID3D11ShaderResourceView *p = nullptr;
deviceContext->PSSetShaderResources(4, 1, &p);
ID3D11ShaderResourceView * const nullView = nullptr;
deviceContext->PSSetShaderResources(4, 1, &nullView);
// disable color writes
deviceContext->OMSetBlendState(blendStates.getState(false, 0, 0, true), nullptr, 0xffffffff);
deviceContext->OMSetRenderTargetsAndUnorderedAccessViews(1, &opaqueRenderTarget.get(), depthStencilView2, 0, D3D11_KEEP_UNORDERED_ACCESS_VIEWS, nullptr, nullptr);
@ -556,22 +554,22 @@ struct DX11OITRenderer : public DX11Renderer
//
if (current_pass.autosort)
{
deviceContext->PSSetShaderResources(4, 1, &nullView);
deviceContext->OMSetRenderTargetsAndUnorderedAccessViews(1, &opaqueRenderTarget.get(), depthTexView, 0, D3D11_KEEP_UNORDERED_ACCESS_VIEWS, nullptr, nullptr);
deviceContext->PSSetShaderResources(4, 1, &depthView.get());
// disable color writes
deviceContext->OMSetBlendState(blendStates.getState(false, 0, 0, true), nullptr, 0xffffffff);
drawList<ListType_Translucent, true, DX11OITShaders::OIT>(pvrrc.global_param_tr, previous_pass.tr_count, tr_count);
// unbind depth tex
deviceContext->PSSetShaderResources(4, 1, &nullView);
if (render_pass < render_pass_count - 1)
{
//
// PASS 3b: Geometry pass with TR to update the depth for the next TA render pass
//
ID3D11ShaderResourceView *p = nullptr;
deviceContext->PSSetShaderResources(4, 1, &p);
deviceContext->OMSetRenderTargetsAndUnorderedAccessViews(1, &opaqueRenderTarget.get(), depthTexView, 0, D3D11_KEEP_UNORDERED_ACCESS_VIEWS, nullptr, nullptr);
deviceContext->OMSetRenderTargetsAndUnorderedAccessViews(1, &opaqueRenderTarget.get(), depthStencilView2, 0, D3D11_KEEP_UNORDERED_ACCESS_VIEWS, nullptr, nullptr);
drawList<ListType_Translucent, true, DX11OITShaders::Depth>(pvrrc.global_param_tr, previous_pass.tr_count, tr_count);
}
ID3D11ShaderResourceView *p = nullptr;
deviceContext->PSSetShaderResources(4, 1, &p);
if (!theDX11Context.isIntel())
{
// Intel Iris Plus 640 just crashes
@ -583,8 +581,7 @@ struct DX11OITRenderer : public DX11Renderer
}
else
{
ID3D11ShaderResourceView *p = nullptr;
deviceContext->PSSetShaderResources(4, 1, &p);
deviceContext->PSSetShaderResources(4, 1, &nullView);
drawList<ListType_Translucent, false, DX11OITShaders::Color>(pvrrc.global_param_tr, previous_pass.tr_count, tr_count);
}
if (render_pass < render_pass_count - 1)
@ -607,7 +604,7 @@ struct DX11OITRenderer : public DX11Renderer
std::swap(opaqueTex, multipassTex);
std::swap(opaqueRenderTarget, multipassRenderTarget);
std::swap(opaqueTextureView, multipassTextureView);
deviceContext->PSSetShaderResources(0, 1, &p);
deviceContext->PSSetShaderResources(0, 1, &nullView);
deviceContext->IASetInputLayout(mainInputLayout);
// Clear the stencil from this pass