[Feat|Chore] (Shader): Remove glsl optimizer. Upgrade legacy glsl.

Author: BZLZHH

README.md

@@ -48,8 +48,6 @@ Please see [LICENSE](https://github.com/MobileGL-Dev/MobileGlues/blob/main/LICEN
 
 **glslang** by **KhronosGroup** - [Various Licenses](https://github.com/KhronosGroup/glslang/blob/main/LICENSE.txt): [github](https://github.com/KhronosGroup/glslang)
 
-**GlslOptimizerV2** by **aiekick** - [Apache License 2.0](https://github.com/aiekick/GlslOptimizerV2/blob/master/LICENSE): [github](https://github.com/aiekick/GlslOptimizerV2)
-
 **cJSON** by **DaveGamble** - [MIT License](https://github.com/DaveGamble/cJSON/blob/master/LICENSE): [github](https://github.com/DaveGamble/cJSON)
 
 **OpenGL Mathematics (*GLM*)** by **G-Truc Creation** - [The Happy Bunny License](https://github.com/g-truc/glm/blob/master/copying.txt): [github](https://github.com/g-truc/glm)

src/main/cpp/CMakeLists.txt

@@ -99,7 +99,6 @@ else()
         target_link_libraries(${CMAKE_PROJECT_NAME}
                 ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libglslang.a
                 ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libspirv-cross-c-shared.so
-                ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libshaderconv.so
                 ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libGenericCodeGen.a
                 ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libglslang-default-resource-limits.a
                 ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libMachineIndependent.a
@@ -122,9 +121,6 @@ if(ANDROID)
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
             ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libspirv-cross-c-shared.so
             $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${CMAKE_SOURCE_DIR}/libraries/${ANDROID_ABI}/libshaderconv.so
-            $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>
     )
 endif()
 
@@ -134,4 +130,4 @@ if (PROFILING)
         add_library(perfetto STATIC ${CMAKE_SOURCE_DIR}/3rdparty/perfetto/sdk/perfetto.cc)
         target_link_libraries(${CMAKE_PROJECT_NAME} perfetto ${CMAKE_THREAD_LIBS_INIT})
         target_compile_definitions(${CMAKE_PROJECT_NAME} PUBLIC PROFILING=1)
-endif()
+endif()

src/main/cpp/gl/glsl/glsl_for_es.cpp

@@ -20,10 +20,6 @@
 
 const char* atomicCounterEmulatedWatermark = "// Non-opaque atomic uniform converted to SSBO";
 
-#if !defined(__APPLE__)
-char* (*MesaConvertShader)(const char *src, unsigned int type, unsigned int glsl, unsigned int essl);
-#endif
-
 static TBuiltInResource InitResources()
 {
     TBuiltInResource Resources{};
@@ -353,7 +349,8 @@ std::string GLSLtoGLSLES(const char* glsl_code, GLenum glsl_type, uint essl_vers
     }
 
     return_code = -1;
-    std::string converted = glsl_version<140? GLSLtoGLSLES_1(glsl_code, glsl_type, essl_version, return_code):GLSLtoGLSLES_2(glsl_code, glsl_type, essl_version, return_code);
+    //std::string converted = glsl_version<140? GLSLtoGLSLES_1(glsl_code, glsl_type, essl_version, return_code):GLSLtoGLSLES_2(glsl_code, glsl_type, essl_version, return_code);
+    std::string converted = GLSLtoGLSLES_2(glsl_code, glsl_type, essl_version, return_code);
     if (return_code >= 0 && !converted.empty()) {
         converted = process_uniform_declarations(converted);
         Cache::get_instance().put(sha256_string.c_str(), converted.c_str());
@@ -762,9 +759,14 @@ std::string preprocess_glsl(const std::string& glsl, GLenum shaderType, bool* at
 int get_or_add_glsl_version(std::string& glsl) {
     int glsl_version = getGLSLVersion(glsl.c_str());
     if (glsl_version == -1) {
-        glsl_version = 140;
-        glsl.insert(0, "#version 140\n");
+        glsl_version = 150;
+        glsl.insert(0, "#version 150\n");
+    } else if (glsl_version < 140) {
+        // force upgrade glsl version
+        glsl = replace_line_starting_with(glsl, "#version", "#version 150 compatibility\n");
+        glsl_version = 150;
     }
+
     LOG_D("GLSL version: %d",glsl_version)
     return glsl_version;
 }
@@ -912,7 +914,8 @@ std::string GLSLtoGLSLES_2(const char *glsl_code, GLenum glsl_type, uint essl_ve
     return essl;
 }
 
-std::string GLSLtoGLSLES_1(const char *glsl_code, GLenum glsl_type, uint esversion, int& return_code) {
+std::string GLSLtoGLSLES_1(const char *glsl_code, GLenum glsl_type, uint esversion, int& return_code) { // useless now
+    /*
 #if !defined(__APPLE__)
     LOG_W("Warning: use glsl optimizer to convert shader.")
     if (esversion < 300) esversion = 300;
@@ -924,4 +927,5 @@ std::string GLSLtoGLSLES_1(const char *glsl_code, GLenum glsl_type, uint esversi
     LOG_W_FORCE("Cannot convert glsl with version %d in MacOS/iOS", esversion);
     return std::string(glsl_code);
 #endif
+    */
 }

src/main/cpp/libraries/arm64-v8a/libshaderconv.so

@@ -22,28 +22,6 @@ __attribute__((used))
 #endif
 const char *license = "GNU LGPL-2.1 License";
 
-#ifndef __APPLE__
-extern char *(*MesaConvertShader)(const char *src, unsigned int type,
-                                  unsigned int glsl, unsigned int essl);
-void init_libshaderconv() {
-  const char *shaderconv_lib = "libshaderconv";
-  const char *func_name = "MesaConvertShader";
-  const char *glslconv_name[] = {shaderconv_lib, nullptr};
-  void *glslconv = open_lib(glslconv_name, shaderconv_lib);
-  if (glslconv == nullptr) {
-    LOG_D("%s not found\n", shaderconv_lib);
-  } else {
-    MesaConvertShader = (char *(*)(const char *, unsigned int, unsigned int,
-                                   unsigned int))dlsym(glslconv, func_name);
-    if (MesaConvertShader) {
-      LOG_D("%s loaded\n", shaderconv_lib);
-    } else {
-      LOG_D("failed to load %s\n", shaderconv_lib);
-    }
-  }
-}
-#endif
-
 void init_config() {
   if (check_path())
     config_refresh();
@@ -85,10 +63,6 @@ void proc_init() {
 
   init_settings_post();
 
-#ifndef __APPLE__
-  init_libshaderconv();
-#endif
-
 #if PROFILING
   init_perfetto();
 #endif