ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OpenGLDevice: Set glColorMask() on clear 

Adreno doesn't appear to clear all channels otherwise.
This commit is contained in:
Stenzek 2023-12-03 21:36:11 +10:00
parent 2bdc691111
commit 60b91a1cdb
No known key found for this signature in database
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/opengl_device.cpp
View File

@ -609,7 +609,10 @@ void OpenGLDevice::RenderBlankFrame()
{ {
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearBufferfv(GL_COLOR, 0, s_clear_color.data()); glClearBufferfv(GL_COLOR, 0, s_clear_color.data());
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);
m_gl_context->SwapBuffers(); m_gl_context->SwapBuffers();
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_current_framebuffer ? m_current_framebuffer->GetGLId() : 0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_current_framebuffer ? m_current_framebuffer->GetGLId() : 0);
@ -707,7 +710,10 @@ bool OpenGLDevice::BeginPresent(bool skip_present)
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClearBufferfv(GL_COLOR, 0, s_clear_color.data()); glClearBufferfv(GL_COLOR, 0, s_clear_color.data());
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);
const Common::Rectangle<s32> window_rc = const Common::Rectangle<s32> window_rc =

6
src/util/opengl_texture.cpp
View File

@ -492,7 +492,10 @@ void OpenGLDevice::CommitClear(OpenGLTexture* tex)
{ {
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);
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,
m_last_blend_state.write_a);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
@ -531,7 +534,10 @@ void OpenGLDevice::CommitClear(OpenGLFramebuffer* fb)
{ {
const auto color = FB->GetUNormClearColor(); const auto color = FB->GetUNormClearColor();
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
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,
m_last_blend_state.write_a);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
FB->SetState(GPUTexture::State::Dirty); FB->SetState(GPUTexture::State::Dirty);
} }