Merge pull request #1774 from reicast/skmp/fix-android4.2-gles-init

load_gles_symbols: Try dlsym first on android. Fixes 4.x rendering!

Author: skmp

libswirl/utils/glwrap/gl3w-es.cpp

@@ -1,15 +1,35 @@
+#include "types.h"
 #include "gl3w.h"
 #include "khronos/EGL/egl.h"
 
+#if defined(SUPPORT_EGL) && defined(_ANDROID)
+#include <dlfcn.h>
+#endif
+
 struct rglgen_sym_map { const char *sym; void *ptr; };
 extern const struct rglgen_sym_map rglgen_symbol_map[];
 
 bool load_gles_symbols()
 {
 	#if defined(SUPPORT_EGL)
 		for (int i = 0; rglgen_symbol_map[i].sym != NULL; i++)
-			*(void **)rglgen_symbol_map[i].ptr = (void*)eglGetProcAddress(rglgen_symbol_map[i].sym);
-	
+		{
+		    *(void **)rglgen_symbol_map[i].ptr = nullptr;
+#if defined(_ANDROID)
+		    //try to load via dlsym -- older android can't load everything via eglGetProcAddress
+		    *(void **)rglgen_symbol_map[i].ptr = (void*)dlsym(RTLD_DEFAULT, rglgen_symbol_map[i].sym);
+#endif
+		    // try to load via eglGetProcAddress
+		    if (!*(void **)rglgen_symbol_map[i].ptr) {
+		      *(void **)rglgen_symbol_map[i].ptr = (void*)eglGetProcAddress(rglgen_symbol_map[i].sym);
+		    }
+
+            // print a warning if failed
+            if (!*(void **)rglgen_symbol_map[i].ptr)
+            {
+                printf("WARN: load_gles_symbols: failed to resolve %s\n", rglgen_symbol_map[i].sym);
+            }
+	    }
         return true;
     #else
         return false;    

reicast/android-studio/reicast/src/main/jni/Android.mk

@@ -86,7 +86,7 @@ LOCAL_PRELINK_MODULE  := false
 LOCAL_MODULE	:= dc
 LOCAL_DISABLE_FORMAT_STRING_CHECKS=true
 LOCAL_ASFLAGS += -fPIC -fvisibility=hidden
-LOCAL_LDLIBS  += -llog -lEGL -lz -landroid
+LOCAL_LDLIBS  += -llog -lEGL -lz -landroid -ldl
 #-Wl,-Map,./res/raw/syms.mp3
 LOCAL_ARM_MODE	:= arm