preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-15 02:30:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

GS/DX11: Also check DrawMultiStretchRects copy for srv conflicts with rtv.

Browse Source 
Also adjust the naming.
This commit is contained in:
lightningterror committed 2025-06-23 15:09:03 +02:00
1 parent e64fbb2f0e
commit ed09dca17e
2 files changed
+5 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pcsx2/GS/Renderers/DX11/GSDevice11.cpp
+4 -3
View File
@@ -1281,7 +1281,7 @@ void GSDevice11::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*
if (dTex)
{
ds = dTex->GetSize();
PSUnbindConflictingSRVs(dTex, nullptr);
PSUnbindConflictingSRVs(dTex);
if (draw_in_depth)
OMSetRenderTargets(nullptr, dTex);
else
@@ -1457,6 +1457,7 @@ void GSDevice11::DrawMultiStretchRects(const MultiStretchRect* rects, u32 num_re
PSSetShader(m_convert.ps[static_cast<int>(shader)].get(), nullptr);
OMSetDepthStencilState(dTex->IsRenderTarget() ? m_convert.dss.get() : m_convert.dss_write.get(), 0);
PSUnbindConflictingSRVs(dTex);
OMSetRenderTargets(dTex->IsRenderTarget() ? dTex : nullptr, dTex->IsDepthStencil() ? dTex : nullptr);
const GSVector2 ds(static_cast<float>(dTex->GetWidth()), static_cast<float>(dTex->GetHeight()));
@@ -2365,13 +2366,13 @@ void GSDevice11::PSUpdateShaderState()
m_ctx->PSSetSamplers(0, m_state.ps_ss.size(), m_state.ps_ss.data());
}
void GSDevice11::PSUnbindConflictingSRVs(GSTexture* rt, GSTexture* ds)
void GSDevice11::PSUnbindConflictingSRVs(GSTexture* tex1, GSTexture* tex2)
{
// Make sure no SRVs are bound using the same texture before binding it to a RTV.
bool changed = false;
for (size_t i = 0; i < m_state.ps_sr_views.size(); i++)
{
if ((rt && m_state.ps_sr_views[i] == *(GSTexture11*)rt) || (ds && m_state.ps_sr_views[i] == *(GSTexture11*)ds))
if ((tex1 && m_state.ps_sr_views[i] == *(GSTexture11*)tex1) || (tex2 && m_state.ps_sr_views[i] == *(GSTexture11*)tex2))
{
m_state.ps_sr_views[i] = nullptr;
changed = true;
pcsx2/GS/Renderers/DX11/GSDevice11.h
+1 -1
View File
@@ -325,7 +325,7 @@ public:
void PSSetShaderResource(int i, GSTexture* sr);
void PSSetShader(ID3D11PixelShader* ps, ID3D11Buffer* ps_cb);
void PSUpdateShaderState();
void PSUnbindConflictingSRVs(GSTexture* rt, GSTexture* ds);
void PSUnbindConflictingSRVs(GSTexture* tex1 = nullptr, GSTexture* tex2 = nullptr);
void PSSetSamplerState(ID3D11SamplerState* ss0);
void OMSetDepthStencilState(ID3D11DepthStencilState* dss, u8 sref);