Merge pull request ddnet#7162 from Jupeyy/pr_fix_clipping_chat

Disable scissor for clearing the framebuffer
Robyt3 · Sep 10, 2023 · 36867df · 36867df
2 parents e8f17aa + ca29263
commit 36867df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/engine/client/backend/opengl/backend_opengl.cpp b/src/engine/client/backend/opengl/backend_opengl.cpp
@@ -966,8 +966,18 @@ void CCommandProcessorFragment_OpenGL::Cmd_TextTextures_Create(const CCommandBuf
 
 void CCommandProcessorFragment_OpenGL::Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand)
 {
+ // if clip is still active, force disable it for clearing, enable it again afterwards
+ bool ClipWasEnabled = m_LastClipEnable;
+ if(ClipWasEnabled)
+ {
+ glDisable(GL_SCISSOR_TEST);
+ }
  glClearColor(pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, 0.0f);
  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+ if(ClipWasEnabled)
+ {
+ glEnable(GL_SCISSOR_TEST);
+ }
 }
 
 void CCommandProcessorFragment_OpenGL::Cmd_Render(const CCommandBuffer::SCommand_Render *pCommand)

diff --git a/src/engine/client/backend/opengl/backend_opengl3.cpp b/src/engine/client/backend/opengl/backend_opengl3.cpp
@@ -756,12 +756,22 @@ void CCommandProcessorFragment_OpenGL3_3::Cmd_TextTextures_Create(const CCommand
 
 void CCommandProcessorFragment_OpenGL3_3::Cmd_Clear(const CCommandBuffer::SCommand_Clear *pCommand)
 {
+ // if clip is still active, force disable it for clearing, enable it again afterwards
+ bool ClipWasEnabled = m_LastClipEnable;
+ if(ClipWasEnabled)
+ {
+ glDisable(GL_SCISSOR_TEST);
+ }
  if(pCommand->m_Color.r != m_ClearColor.r || pCommand->m_Color.g != m_ClearColor.g || pCommand->m_Color.b != m_ClearColor.b)
  {
  glClearColor(pCommand->m_Color.r, pCommand->m_Color.g, pCommand->m_Color.b, 0.0f);
  m_ClearColor = pCommand->m_Color;
  }
  glClear(GL_COLOR_BUFFER_BIT);
+ if(ClipWasEnabled)
+ {
+ glEnable(GL_SCISSOR_TEST);
+ }
 }
 
 void CCommandProcessorFragment_OpenGL3_3::UploadStreamBufferData(unsigned int PrimitiveType, const void *pVertices, size_t VertSize, unsigned int PrimitiveCount, bool AsTex3D)