multiple fix

Author: BZLZHH

src/main/cpp/egl/egl.cpp

@@ -560,7 +560,7 @@ void glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage
 void* glMapBuffer(GLenum target, GLenum access) {
     LOG()
     LOG_D("glMapBuffer, target = %s, access = %s", glEnumToString(target), glEnumToString(access))
-    if(g_gles_caps.GL_OES_mapbuffer) {
+    if(g_gles_caps.GL_OES_mapbuffer && GLES.glMapBufferOES) {
         return GLES.glMapBufferOES(target, access);
     }
     if (get_binding_query(target) == 0) {
@@ -640,7 +640,7 @@ void* glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitf
 GLboolean glUnmapBuffer(GLenum target) {
     LOG()
     LOG_D("%s(%s)", __func__, glEnumToString(target));
-    if(g_gles_caps.GL_OES_mapbuffer)
+    if(g_gles_caps.GL_OES_mapbuffer && GLES.glMapBufferOES)
         return GLES.glUnmapBuffer(target);
 
     GLint buffer;

src/main/cpp/gl/buffer.cpp

@@ -147,7 +147,12 @@ std::string getBeforeThirdSpace(const std::string& str) {
 }
 
 std::string getGpuName() {
-    std::string gpuName = std::string((char *)GLES.glGetString(GL_RENDERER));
+    char* name = (char *)GLES.glGetString(GL_RENDERER);
+    if (!name) {
+        LOG_E("getGpuName: Failed to get GLES.glGetString(GL_RENDERER)")
+        return "<unknown>";
+    }
+    std::string gpuName = std::string(name);
 
     if (gpuName.empty()) {
         return "<unknown>";
@@ -200,14 +205,28 @@ void set_es_version() {
 }
 
 std::string getGLESName() {
-    return getBeforeThirdSpace(std::string((char *)GLES.glGetString(GL_VERSION)));
+    char* str = (char *)GLES.glGetString(GL_VERSION);
+    if (!str) {
+        LOG_E("getGLESName: Failed to get GLES.glGetString(GL_VERSION)")
+        return "<unknown>";
+    }
+    return getBeforeThirdSpace(std::string(str));
 }
 
+static bool gles_initialized = false;
 static std::string rendererString;
 static std::string vendorString;
 static std::string versionString;
+void init_target_gles();
 const GLubyte * glGetString( GLenum name ) {
     LOG()
+    if (!gles_initialized) {
+        load_libs();
+        init_target_egl();
+        init_target_gles();
+        gles_initialized=true;
+    }
+    LOG_D("glGetString, %d", name)
     switch (name) {
         case GL_VENDOR: {
             if(vendorString.empty()) {

src/main/cpp/gl/getter.cpp

@@ -16,7 +16,7 @@
 #include "cache.h"
 #include "../../version.h"
 
-#define DEBUG 0	
+#define DEBUG 0
 
 const char* atomicCounterEmulatedWatermark = "// Non-opaque atomic uniform converted to SSBO";
 
@@ -802,7 +802,8 @@ std::vector<unsigned int> glsl_to_spirv(GLenum shader_type, int glsl_version, co
     using namespace glslang;
     shader.setEnvInput(EShSourceGlsl, shader_language, EShClientVulkan, glsl_version);
     shader.setEnvClient(EShClientOpenGL, EShTargetOpenGL_450);
-    shader.setEnvTarget(EShTargetSpv, EShTargetSpv_1_6);
+    //shader.setEnvTarget(EShTargetSpv, EShTargetSpv_1_6);
+    shader.setEnvTarget(EShTargetSpv, EShTargetSpv_1_5);
     shader.setAutoMapLocations(true);
     shader.setAutoMapBindings(true);
 

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

@@ -8,7 +8,7 @@
 
 #define FORCE_SYNC_WITH_LOG_FILE 0
 
-#define GLOBAL_DEBUG_FORCE_OFF 1
+#define GLOBAL_DEBUG_FORCE_OFF 0
 
 #define GLOBAL_DEBUG 0
 

src/main/cpp/gl/log.h

@@ -136,4 +136,4 @@ GLuint glCreateShader(GLenum shaderType) {
         shader_map_is_sampler_buffer_emulated[shader] = false;
     CHECK_GL_ERROR
     return shader;
-}
+}

src/main/cpp/gl/shader.cpp

@@ -34,6 +34,7 @@ static const char *lib_ext[] = {
 #ifndef NO_GBM
         "so.19",
 #endif
+        "",
         "so",
         "so.1",
         "so.2",
@@ -43,6 +44,7 @@ static const char *lib_ext[] = {
 };
 
 static const char *gles3_lib[] = {
+        "libGLESv2.so.2",
         "libGLESv3_CM",
         "libGLESv3",
         nullptr
@@ -61,6 +63,7 @@ const char *EGL_ANGLE = "libEGL_angle.so";
 
 void *open_lib(const char **names, const char *override) {
     void *lib = nullptr;
+    LOG_D("LIBGL: loading %s (override: %s)", names[0], override ? override : "(null)")
 
     char path_name[PATH_MAX + 1];
     int flags = RTLD_LOCAL | RTLD_NOW;
@@ -78,20 +81,42 @@ void *open_lib(const char **names, const char *override) {
             for (int e = 0; lib_ext[e]; e++) {
                 snprintf(path_name, PATH_MAX, "%s%s.%s", path_prefix[p], names[i], lib_ext[e]);
                 if ((lib = dlopen(path_name, flags))) {
+                    LOG_D("LIBGL:loaded: %s\n", path_name)
                     return lib;
                 }
             }
         }
     }
+    if (lib == nullptr) {
+        LOG_D("LIBGL:failed to load")
+    } else {
+        LOG_D("LIBGL:loaded")
+    }
     return lib;
 }
 
 void load_libs() {
 #ifndef __APPLE__
     const char *gles_override = global_settings.angle == AngleMode::Enabled ? GLES_ANGLE : nullptr;
     const char *egl_override = global_settings.angle == AngleMode::Enabled ? EGL_ANGLE : nullptr;
+#ifndef __ANDROID__
     gles = open_lib(gles3_lib, gles_override);
     egl = open_lib(egl_lib, egl_override);
+#else
+    void* gles_lib = dlopen("libGLESv2.so", RTLD_LAZY | RTLD_GLOBAL);
+    if (!gles_lib) {
+        gles_lib = dlopen("libGLESv2.so.2", RTLD_LAZY | RTLD_GLOBAL);
+    }
+
+    if (!gles_lib) {
+        fprintf(stderr, "GLES load failed: %s\n", dlerror());
+    }
+    gles = gles_lib;
+    egl = dlopen("libEGL.so", RTLD_LAZY);
+    if (!egl) {
+        LOG_E("LIBGL: failed to load libEGL.so")
+    }
+#endif
 #else
     gles = (void*)(~(uintptr_t)0);
     egl = (void*)(~(uintptr_t)0);

src/main/cpp/gles/loader.cpp

@@ -24,14 +24,14 @@ void load_libs();
 #define INIT_GLES_FUNC(name)                                                \
     {                                                                       \
         LOG_D("INIT_GLES_FUNC(%s)", #name);                                 \
-        GLES.name = (name##_PTR)proc_address(gles, #name);           \
+        GLES.name = (name##_PTR)proc_address(gles, #name);                  \
         if (GLES.name == NULL)\
-            LOG_W("Error: GLES function " #name " is NULL\n"); \
+            LOG_W("Error: GLES function " #name " is NULL\n");              \
     }
 #else
 #define INIT_GLES_FUNC(name)                                                \
     {                                                                       \
-        GLES.name = (name##_PTR)egl_eglGetProcAddress(#name);           \
+        GLES.name = (name##_PTR)proc_address(gles, #name);                  \
     }
 #endif
 

src/main/cpp/gles/loader.h

@@ -47,16 +47,28 @@ std::string handle_multidraw_func_name(std::string name) {
     return namestr;
 }
 
+
+void* get_self_handle() {
+    static void* handle = NULL;
+    if (!handle) {
+        Dl_info info;
+        dladdr((void*)&get_self_handle, &info);
+        handle = dlopen(info.dli_fname, RTLD_LAZY | RTLD_NOLOAD);
+    }
+    return handle;
+}
+
 __GLXextFuncPtr glXGetProcAddress(const GLubyte * name) {
     LOG()
     std::string real_func_name = handle_multidraw_func_name(std::string((const char*)name));
 #ifdef __APPLE__
     return dlsym((void*)(~(uintptr_t)0), real_func_name.c_str());
 #else
 
+    void* self = get_self_handle();
     void* proc = nullptr;
 
-    proc = dlsym(RTLD_DEFAULT, real_func_name.c_str());
+    proc = dlsym(self, real_func_name.c_str());
 
     if (!proc) {
         LOG_W("Failed to get OpenGL function: %s", real_func_name.c_str())