UMP stage 1 part 2

hopefully that should be all? part 3 might be needed
SolDev69 · Jan 1, 2024 · cd5f832 · cd5f832
1 parent b27a3ce
commit cd5f832
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -455,8 +455,10 @@ public static String loadGraphicsLibrary(){
                 renderLibrary = "libgl4es_114.so"; break;
             case "vgpu":
                 renderLibrary = "libvgpu.so"; break;
-            case "malihw_panfrost": renderLibrary = "libOSMesa_pan.so"; break;
-            case "vulkan_zink_legacy": renderLibrary = "libOSMesa_znL.so"; break;
+            case "malihw_panfrost": 
+                renderLibrary = "libOSMesa_pan.so"; break;
+            case "vulkan_zink_legacy": 
+                renderLibrary = "libOSMesa_znL.so"; break;
             case "vulkan_zink":
             case "swrast":
             case "virgl":

diff --git a/app_pojavlauncher/src/main/jni/egl_bridge.c b/app_pojavlauncher/src/main/jni/egl_bridge.c
@@ -82,24 +82,6 @@ EXTERNAL_API void pojavTerminate() {
     }
 }
 
-bool loadSymbolsVirGL() {
-    pojav_environ->config_renderer = RENDERER_VK_ZINK;
-    //loadSymbols(); TODO: reimplement
-
-    char* fileName = calloc(1, 1024);
-
-    sprintf(fileName, "%s/libvirgl_test_server.so", getenv("POJAV_NATIVEDIR"));
-    void *handle = dlopen(fileName, RTLD_LAZY);
-    printf("VirGL: libvirgl_test_server = %p\n", handle);
-    if (!handle) {
-        printf("VirGL: %s\n", dlerror());
-    }
-    vtest_main_p = dlsym(handle, "vtest_main");
-    vtest_swap_buffers_p = dlsym(handle, "vtest_swap_buffers");
-
-    free(fileName);
-}
-
 JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_setupBridgeWindow(JNIEnv* env, ABI_COMPAT jclass clazz, jobject surface) {
     pojav_environ->pojavWindow = ANativeWindow_fromSurface(env, surface);
     if(br_setup_window != NULL) br_setup_window();
@@ -222,11 +204,11 @@ int pojavInitOpenGL() {
         if(strcmp(getenv("OSMESA_NO_FLUSH_FRONTBUFFER"),"1") == 0) {
             printf("VirGL: OSMesa buffer flush is DISABLED!\n");
         }
-        loadSymbolsVirGL();
+        set_osm_bridge_tbl();
     } else if (strncmp("opengles", renderer, 8) == 0) {
         pojav_environ->config_renderer = RENDERER_GL4ES;
         set_gl_bridge_tbl();
-    } else if (strcmp(renderer, "vulkan_zink") == 0) {
+    } else if (strcmp(renderer, "vulkan_zink") == 0 || strcmp(rendersd, "vulkan_zink_legacy") == 0) {
         pojav_environ->config_renderer = RENDERER_VK_ZINK;
         load_vulkan();
         setenv("MESA_LOADER_DRIVER_OVERRIDE","zink",1);
@@ -242,6 +224,7 @@ int pojavInitOpenGL() {
         setenv("GALLIUM_DRIVER", "freedreno", 1);
         setenv("MESA_LOADER_DRIVER_OVERRIDE", "kgsl", 1);
         set_osm_bridge_tbl();
+    } else if
     }
     if(br_init()) {
         br_setup_window();

diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -68,7 +68,7 @@
     <string name="mcl_setting_renderer_vulkan_zink">Zink (Vulkan) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_angle">ANGLE (Vulkan) - (1.17+ only, fast)</string>
     <string name="mcl_setting_renderer_angle_new">Updated ANGLE (Vulkan, NOT IMPLEMENTED!) - (1.17+ only, mid)</string>
-    <string name="mcl_setting_renderer_panfrost">Panfrost (Mali) - (all versions, mid)</string>
+    <string name="mcl_setting_renderer_panfrost">Panfrost (Mali Gx10 only) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_freedreno">Freedreno (Adreno) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_softpipe">softpipe (CPU) - (all versions, very slow)</string>