Skip to content

GS/GL/DX11: Don't bind source tex on shader resource if it's tex is fb with no barrier. #14253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lightningterror wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

GS/GL/DX11: Don't bind source tex on shader resource if it's tex is fb with no barrier. #14253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pcsx2/GS/Renderers/DX11/GSDevice11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2804,7 +2804,7 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)

// Preemptively bind srv if possible.
// We update the local state, then if there are srv conflicts PSUnbindConflictingSRVs will update the gpu state.
if (config.tex)
if (config.tex && config.tex != config.rt)
{
CommitClear(config.tex);
if (m_state.cached_rt_view != config.tex && m_state.cached_dsv != config.tex)
Expand All @@ -2820,7 +2820,7 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)
// Should be called before changing current gpu state.
PSUnbindConflictingSRVs(colclip_rt ? colclip_rt : config.rt, read_only_dsv ? nullptr : config.ds);

if (config.tex)
if (config.tex && config.tex != config.rt)
PSSetShaderResource(0, config.tex);
if (config.pal)
PSSetShaderResource(1, config.pal);
Expand Down
4 changes: 2 additions & 2 deletions pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2599,7 +2599,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
GLState::scissor = config.scissor;
}

if (config.tex)
if (config.tex && (m_features.texture_barrier || (config.tex != config.rt)))
CommitClear(config.tex, true);
if (config.pal)
CommitClear(config.pal, true);
Expand Down Expand Up @@ -2715,7 +2715,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
}
IASetPrimitiveTopology(topology);

if (config.tex)
if (config.tex && (m_features.texture_barrier || (config.tex != config.rt)))
PSSetShaderResource(0, config.tex);
if (config.pal)
PSSetShaderResource(1, config.pal);
Expand Down
Loading