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

GS/OpenGL: Fix fb target conflict without fbfetch

This commit is contained in:
Connor McLaughlin 2022-03-27 12:58:05 +10:00 committed by refractionpcsx2
parent 3a7f82eb66
commit d3aace98ac
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
View File

@ -1653,14 +1653,9 @@ void GSDeviceOGL::OMAttachDs(GSTextureOGL* ds)
if (GLState::ds != id) if (GLState::ds != id)
{ {
GLState::ds = id; GLState::ds = id;
if (ds && ds->IsDss())
{ const GLenum target = GLLoader::found_framebuffer_fetch ? GL_DEPTH_ATTACHMENT : GL_DEPTH_STENCIL_ATTACHMENT;
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, id, 0); glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, target, GL_TEXTURE_2D, id, 0);
}
else
{
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, id, 0);
}
} }
} }

1
pcsx2/GS/Renderers/OpenGL/GSTextureOGL.h
View File

@ -71,7 +71,6 @@ public:
void Swap(GSTexture* tex) final; void Swap(GSTexture* tex) final;
GSMap Read(const GSVector4i& r, AlignedBuffer<u8, 32>& buffer); GSMap Read(const GSVector4i& r, AlignedBuffer<u8, 32>& buffer);
bool IsDss() { return (m_type == Type::DepthStencil || m_type == Type::SparseDepthStencil) && !GLLoader::found_framebuffer_fetch; }
bool IsDepth() { return (m_type == Type::DepthStencil || m_type == Type::SparseDepthStencil); } bool IsDepth() { return (m_type == Type::DepthStencil || m_type == Type::SparseDepthStencil); }
bool IsIntegerFormat() const bool IsIntegerFormat() const
{ {