[Improvement] (settings): Remove gl43 extension switch.

Author: BZLZHH

src/main/cpp/config/settings.cpp

@@ -17,7 +17,6 @@ void init_settings() {
 #if defined(__APPLE__)
     global_settings.angle = AngleMode::Disabled;
     global_settings.ignore_error = IgnoreErrorLevel::Partial;
-    global_settings.ext_gl43 = false;
     global_settings.ext_compute_shader = false;
     global_settings.max_glsl_cache_size = 30 * 1024 * 1024;
     global_settings.multidraw_mode = multidraw_mode_t::DrawElements;
@@ -41,7 +40,6 @@ void init_settings() {
         success ? static_cast<AngleConfig>(config_get_int("enableANGLE")) : AngleConfig::DisableIfPossible;
     NoErrorConfig noErrorConfig =
         success ? static_cast<NoErrorConfig>(config_get_int("enableNoError")) : NoErrorConfig::Auto;
-    bool enableExtGL43 = success ? (config_get_int("enableExtGL43") > 0) : false;
     bool enableExtComputeShader = success ? (config_get_int("enableExtComputeShader") > 0) : false;
     bool enableExtTimerQuery = success ? (config_get_int("enableExtTimerQuery") > 0) : false;
     bool enableExtDirectStateAccess = success ? (config_get_int("enableExtDirectStateAccess") > 0) : false;
@@ -108,7 +106,6 @@ void init_settings() {
         LOG_V("Unsupported launcher detected, force using default config.")
         angleConfig = AngleConfig::DisableIfPossible;
         noErrorConfig = NoErrorConfig::Auto;
-        enableExtGL43 = false;
         enableExtComputeShader = false;
         enableExtTimerQuery = true;
         enableExtDirectStateAccess = true;
@@ -188,7 +185,6 @@ void init_settings() {
         break;
     }
 
-    global_settings.ext_gl43 = enableExtGL43;
     global_settings.ext_compute_shader = enableExtComputeShader;
     global_settings.ext_timer_query = enableExtTimerQuery;
     global_settings.ext_direct_state_access = enableExtDirectStateAccess;
@@ -204,7 +200,6 @@ void init_settings() {
     LOG_V("[MobileGlues] Setting: ignoreError                 = %i", static_cast<int>(global_settings.ignore_error))
     LOG_V("[MobileGlues] Setting: enableExtComputeShader      = %s",
           global_settings.ext_compute_shader ? "true" : "false")
-    LOG_V("[MobileGlues] Setting: enableExtGL43               = %s", global_settings.ext_gl43 ? "true" : "false")
     LOG_V("[MobileGlues] Setting: enableExtTimerQuery         = %s", global_settings.ext_timer_query ? "true" : "false")
     LOG_V("[MobileGlues] Setting: enableExtDirectStateAccess  = %s",
           global_settings.ext_direct_state_access ? "true" : "false")
@@ -350,7 +345,6 @@ std::string dump_settings_string(std::string prefix) {
     }
     ss << "\n";
 
-    ss << prefix << "ExtGL43: " << (global_settings.ext_gl43 ? "True" : "False") << "\n";
     ss << prefix << "ExtComputeShader: " << (global_settings.ext_compute_shader ? "True" : "False") << "\n";
     ss << prefix << "ExtTimerQuery: " << (global_settings.ext_timer_query ? "True" : "False") << "\n";
     ss << prefix << "ExtDirectStateAccess: " << (global_settings.ext_direct_state_access ? "True" : "False") << "\n";
@@ -415,8 +409,10 @@ std::string dump_settings_string(std::string prefix) {
     }
     ss << "\n";
 
-    ss << prefix << "HideMGEnvLevel: " << ((global_settings.hide_mg_env_level == HideMGEnvLevel::Disabled)
-        ? "Disabled" : std::to_string(static_cast<int>(global_settings.hide_mg_env_level)));
+    ss << prefix << "HideMGEnvLevel: "
+       << ((global_settings.hide_mg_env_level == HideMGEnvLevel::Disabled)
+               ? "Disabled"
+               : std::to_string(static_cast<int>(global_settings.hide_mg_env_level)));
 
     ss << "\n";
 

src/main/cpp/config/settings.h

@@ -157,7 +157,6 @@ typedef enum class FSR1_Quality_Preset : int { // may be useless
 struct global_settings_t {
     AngleMode angle;
     IgnoreErrorLevel ignore_error;
-    bool ext_gl43;
     bool ext_compute_shader;
     bool ext_timer_query;
     bool ext_direct_state_access;

src/main/cpp/gl/gl.cpp

@@ -29,11 +29,7 @@ static GLuint g_depthClearProgram = 0;
 static GLuint g_depthClearVAO = 0;
 static GLuint g_depthClearVBO = 0;
 
-static const GLfloat kFullScreenTri[3][2] = {
-    { -1.0f, -1.0f },
-    {  3.0f, -1.0f },
-    { -1.0f,  3.0f }
-};
+static const GLfloat kFullScreenTri[3][2] = {{-1.0f, -1.0f}, {3.0f, -1.0f}, {-1.0f, 3.0f}};
 
 static const char* kDepthClearVS = R"glsl(
     #version 300 es
@@ -61,7 +57,7 @@ void InitDepthClearCoreProfile() {
         GLES.glShaderSource(s, 1, &src, nullptr);
         GLES.glCompileShader(s);
         return s;
-        };
+    };
     GLuint vs = compile(GL_VERTEX_SHADER, kDepthClearVS);
     GLuint fs = compile(GL_FRAGMENT_SHADER, kDepthClearFS);
 
@@ -99,7 +95,7 @@ void DrawDepthClearTri() {
     GLES.glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
     GLES.glDepthMask(GL_TRUE);
     GLES.glDepthFunc(GL_ALWAYS);
-    
+
     GLES.glUseProgram(g_depthClearProgram);
     GLES.glBindVertexArray(g_depthClearVAO);
     GLES.glDrawArrays(GL_TRIANGLES, 0, 3);
@@ -119,20 +115,18 @@ void glClear(GLbitfield mask) {
 
     CHECK_GL_ERROR_NO_INIT
 
-    if (global_settings.angle == AngleMode::Enabled &&
-        mask == GL_DEPTH_BUFFER_BIT && 
-        fabs(currentDepthValue - 1.0f) <= 0.001f
-        && framebuffers[current_draw_fbo].color_attachments_all_none
-        ) {
+    if (global_settings.angle == AngleMode::Enabled && mask == GL_DEPTH_BUFFER_BIT &&
+        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();
-        else if (global_settings.angle_depth_clear_fix_mode == AngleDepthClearFixMode::Mode2) {
-            // Or just explicitly clear depth buffer and see what's happened
-            const GLfloat clear_depth_value = 1.0f;
-            GLES.glClearBufferfv(GL_DEPTH, 0, &clear_depth_value);
-        }
+        // 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();
+        // else if (global_settings.angle_depth_clear_fix_mode == AngleDepthClearFixMode::Mode2) {
+        // Or just explicitly clear depth buffer and see what's happened
+        const GLfloat clear_depth_value = 1.0f;
+        GLES.glClearBufferfv(GL_DEPTH, 0, &clear_depth_value);
+        //}
         // Clear again
         GLES.glClear(mask);
     } else {

src/main/cpp/gles/loader.cpp

@@ -192,10 +192,6 @@ void InitGLESCapabilities() {
         AppendExtension("GL_EXT_timer_query");
     }
 
-    if (global_settings.ext_gl43) {
-        AppendExtension("OpenGL43");
-    }
-
     if (global_settings.ext_compute_shader) {
         AppendExtension("GL_ARB_compute_shader");
     }
@@ -207,7 +203,6 @@ void InitGLESCapabilities() {
 
     int glVersion = GLVersion.toInt(2);
     for (int ver = 32; ver <= glVersion; ++ver) {
-        if (global_settings.ext_gl43 && ver == 43) continue;
         if (ver > 33 && ver < 40) continue;
         LOG_D("Appending OpenGL extension for version %d", ver)
         AppendExtension(("OpenGL" + std::to_string(ver)).c_str());