[Fix] (GL, Framebuffer): employ depth clear hack according to fbo status

Author: Swung0x48

src/main/cpp/gl/framebuffer.cpp

@@ -8,22 +8,12 @@
 #include "FSR1/FSR1.h"
 
 #define DEBUG 0
-struct attachment_t {
-    GLenum textarget;
-    GLuint texture;
-    GLint level;
-};
-struct framebuffer_t {
-    bool initialized = false;
-    attachment_t* color_attachments = nullptr;
-    attachment_t depth_attachment = {0};
-    attachment_t stencil_attachment = {0};
-};
+
 static GLint MAX_COLOR_ATTACHMENTS = 0;
 static GLint MAX_DRAW_BUFFERS = 0;
-static GLuint current_draw_fbo = 0;
-static GLuint current_read_fbo = 0;
-static std::vector<framebuffer_t> framebuffers;
+GLuint current_draw_fbo = 0;
+GLuint current_read_fbo = 0;
+std::vector<framebuffer_t> framebuffers;
 void ensure_max_attachments() {
     if (MAX_COLOR_ATTACHMENTS == 0) {
         GLES.glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &MAX_COLOR_ATTACHMENTS);
@@ -96,32 +86,59 @@ void glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLin
     GLES.glFramebufferTexture(target, attachment, texture, level);
 }
 void glDrawBuffer(GLenum buffer) {
-    GLint currentFBO;
-    GLES.glGetIntegerv(GL_FRAMEBUFFER_BINDING, &currentFBO);
-    if (currentFBO == 0) {
+    LOG()
+    LOG_D("glDrawBuffer %d", buffer)
+
+//    GLint currentFBO;
+//    GLES.glGetIntegerv(GL_FRAMEBUFFER_BINDING, &currentFBO);
+    if (current_draw_fbo == 0) {
         GLenum buffers[] = {buffer};
-        GLES.glDrawBuffers(1, buffers);
+        glDrawBuffers(1, buffers);
     } else {
         GLint maxAttachments;
         GLES.glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &maxAttachments);
 
         if (buffer == GL_NONE) {
+            framebuffers[current_draw_fbo].color_attachments_all_none = true;
             std::vector<GLenum> buffers(maxAttachments, GL_NONE);
-            GLES.glDrawBuffers(maxAttachments, buffers.data());
+            glDrawBuffers(maxAttachments, buffers.data());
         } else if (buffer >= GL_COLOR_ATTACHMENT0 && buffer < GL_COLOR_ATTACHMENT0 + maxAttachments) {
+            framebuffers[current_draw_fbo].color_attachments_all_none = false;
             std::vector<GLenum> buffers(maxAttachments, GL_NONE);
             buffers[buffer - GL_COLOR_ATTACHMENT0] = buffer;
-            GLES.glDrawBuffers(maxAttachments, buffers.data());
+            glDrawBuffers(maxAttachments, buffers.data());
         }
     }
+    CHECK_GL_ERROR;
 }
 void glDrawBuffers(GLsizei n, const GLenum* bufs) {
+    LOG()
     if (current_draw_fbo == 0) {
         GLES.glDrawBuffers(n, bufs);
         return;
     }
-    std::vector<GLenum> new_bufs(n);
+
     framebuffer_t& fbo = framebuffers[current_draw_fbo];
+
+    bool all_none = true;
+    for (int i = 0; i < n; ++i) {
+        if (bufs[i] != GL_NONE) {
+            all_none = false;
+            break;
+        }
+    }
+
+    if (all_none) {
+        LOG_D("glDrawBuffers, fb %d all_none true", current_draw_fbo)
+        fbo.color_attachments_all_none = true;
+        GLES.glDrawBuffers(n, bufs);
+        return;
+    } else {
+        LOG_D("glDrawBuffers, fb %d all_none false", current_draw_fbo)
+        fbo.color_attachments_all_none = false;
+    }
+
+    std::vector<GLenum> new_bufs(n);
     for (int i = 0; i < n; i++) {
         if (bufs[i] >= GL_COLOR_ATTACHMENT0 && bufs[i] < GL_COLOR_ATTACHMENT0 + MAX_COLOR_ATTACHMENTS) {
             GLenum logical_attachment = bufs[i];

src/main/cpp/gl/framebuffer.h

@@ -8,6 +8,19 @@
 #include <GL/gl.h>
 #include <cstddef>
 
+struct attachment_t {
+    GLenum textarget;
+    GLuint texture;
+    GLint level;
+};
+struct framebuffer_t {
+    bool initialized = false;
+    bool color_attachments_all_none = false;
+    attachment_t* color_attachments = nullptr;
+    attachment_t depth_attachment = {0};
+    attachment_t stencil_attachment = {0};
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/main/cpp/gl/gl.cpp

@@ -9,11 +9,15 @@
 #include "../gles/loader.h"
 #include "../config/settings.h"
 #include "mg.h"
+#include "framebuffer.h"
 
 #define DEBUG 0
 
 static GLclampd currentDepthValue;
 
+extern GLuint current_draw_fbo;
+extern std::vector<framebuffer_t> framebuffers;
+
 void glClearDepth(GLclampd depth) {
     LOG()
     currentDepthValue = depth;
@@ -111,9 +115,17 @@ void glClear(GLbitfield mask) {
     LOG();
     LOG_D("glClear, mask = 0x%x", mask);
 
+    INIT_CHECK_GL_ERROR
+
+    GLES.glClear(mask);
+    CHECK_GL_ERROR_NO_INIT
+
     if (global_settings.angle == AngleMode::Enabled &&
         mask == GL_DEPTH_BUFFER_BIT && 
-        fabs(currentDepthValue - 1.0f) <= 0.001f) {
+        fabs(currentDepthValue - 1.0f) <= 0.001f
+        && framebuffers[current_draw_fbo].color_attachments_all_none
+        ) {
+        LOG_D("doing depth workaround")
         if (global_settings.angle_depth_clear_fix_mode == AngleDepthClearFixMode::Mode1)
             // Workaround for ANGLE depth-clear bug: if depth≈1.0, draw a fullscreen triangle at z=1.0 to force actual depth buffer write.
             DrawDepthClearTri();
@@ -124,9 +136,8 @@ void glClear(GLbitfield mask) {
         }
         // Clear again
     }
-    GLES.glClear(mask);
 
-    CHECK_GL_ERROR;
+    CHECK_GL_ERROR_NO_INIT;
 }
 
 void glHint(GLenum target, GLenum mode) {