Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 22:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGLDevice: Fix depth clears not going through

Browse source
This commit is contained in:
Stenzek 2024-03-24 20:47:37 +10:00
parent 480c78502f
commit 9cdff4781f
No known key found for this signature in database
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/util/opengl_texture.cpp
View file

@ -484,17 +484,25 @@ void OpenGLDevice::CommitClear(OpenGLTexture* tex)
{ {
const float depth = tex->GetClearDepth(); const float depth = tex->GetClearDepth();
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
if (!m_last_depth_state.depth_write)
glDepthMask(GL_TRUE);
glClearBufferfv(GL_DEPTH, 0, &depth); glClearBufferfv(GL_DEPTH, 0, &depth);
if (!m_last_depth_state.depth_write)
glDepthMask(GL_FALSE);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
else else
{ {
const auto color = tex->GetUNormClearColor(); const auto color = tex->GetUNormClearColor();
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); if (m_last_blend_state.write_mask != 0xf)
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearBufferfv(GL_COLOR, 0, color.data()); glClearBufferfv(GL_COLOR, 0, color.data());
glColorMask(m_last_blend_state.write_r, m_last_blend_state.write_g, m_last_blend_state.write_b, if (m_last_blend_state.write_mask != 0xf)
m_last_blend_state.write_a); {
glColorMask(m_last_blend_state.write_r, m_last_blend_state.write_g, m_last_blend_state.write_b,
m_last_blend_state.write_a);
}
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
@ -529,10 +537,14 @@ void OpenGLDevice::CommitRTClearInFB(OpenGLTexture* tex, u32 idx)
{ {
const auto color = tex->GetUNormClearColor(); const auto color = tex->GetUNormClearColor();
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); if (m_last_blend_state.write_mask != 0xf)
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearBufferfv(GL_COLOR, static_cast<GLint>(idx), color.data()); glClearBufferfv(GL_COLOR, static_cast<GLint>(idx), color.data());
glColorMask(m_last_blend_state.write_r, m_last_blend_state.write_g, m_last_blend_state.write_b, if (m_last_blend_state.write_mask != 0xf)
m_last_blend_state.write_a); {
glColorMask(m_last_blend_state.write_r, m_last_blend_state.write_g, m_last_blend_state.write_b,
m_last_blend_state.write_a);
}
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
tex->SetState(GPUTexture::State::Dirty); tex->SetState(GPUTexture::State::Dirty);
} }
@ -562,7 +574,11 @@ void OpenGLDevice::CommitDSClearInFB(OpenGLTexture* tex)
{ {
const float depth = tex->GetClearDepth(); const float depth = tex->GetClearDepth();
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
if (!m_last_depth_state.depth_write)
glDepthMask(GL_TRUE);
glClearBufferfv(GL_DEPTH, 0, &depth); glClearBufferfv(GL_DEPTH, 0, &depth);
if (!m_last_depth_state.depth_write)
glDepthMask(GL_FALSE);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
tex->SetState(GPUTexture::State::Dirty); tex->SetState(GPUTexture::State::Dirty);
} }