new old virgl

added virgl 21.2.1
SolDev69 · Jul 31, 2024 · 4de69c6 · 4de69c6
1 parent de7e946
commit 4de69c6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 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
@@ -226,9 +226,6 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
             if(LOCAL_RENDERER.equals("opengles3_desktopgl_angle_vulkan")) {
                 envMap.put("POJAVEXEC_EGL","libEGL_angle.so"); // Use ANGLE EGL
             }
-            if(LOCAL_RENDERER.equals("opengles3_desktopgl_angle_vulkan_new")) {
-                envMap.put("POJAVEXEC_EGL","libEGL_angle_new.so"); // Use ANGLE EGL
-            }
             if(LOCAL_RENDERER.equals("malihw_panfrost")) {
                 envMap.put("POJAVEXEC_OSMESA", "libOSMesa_pan.so");
             }
@@ -512,6 +509,9 @@ public static String loadGraphicsLibrary(){
             case "vulkan_zink_pojav":
                 renderLibrary = "libOSMesa_pjv.so";
                 break;
+            case "virgl_a":
+                renderLibrary = "libOSMesa_8.so";
+                break;
             case "swrast":
             case "panfrost_neo":
             case "vulkan_zink":

diff --git a/app_pojavlauncher/src/main/jni/egl_bridge.c b/app_pojavlauncher/src/main/jni/egl_bridge.c
@@ -241,7 +241,7 @@ int pojavInitOpenGL() {
 
     // NOTE: Override for now.
     const char *renderer = getenv("POJAV_RENDERER");
-    if (strncmp("virgl", renderer, 15) == 0) {
+    if (strcmp(renderer, "virgl") == 0 || strcmp(renderer, "virgl_a") == 0) {
         solcraft_environ->config_renderer = RENDERER_VIRGL;
         setenv("GALLIUM_DRIVER","virpipe",1);
 #ifndef ADRENO_POSSIBLE
@@ -549,4 +549,4 @@ EXTERNAL_API void pojavSwapInterval(int interval) {
     } else if(solcraft_environ->config_renderer == RENDERER_VIRGL) {
         eglSwapInterval_p(potatoBridge.eglDisplay, interval);
     }
-}
+}
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libOSMesa_8.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libOSMesa_8.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libOSMesa_8.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libOSMesa_8.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libOSMesa_8.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libOSMesa_8.so
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -9,6 +9,7 @@
         <item name="3">@string/mcl_setting_renderer_angle</item>
 
         <item name="5">@string/mcl_setting_renderer_virgl</item>
+        <item name="5a">@string/mcl_setting_renderer_virgl_a</item>
         <item name="6">@string/mcl_setting_renderer_panfrost</item>
         <item name="6a">@string/mcl_setting_renderer_panfrost_neo</item>
         <item name="7">@string/mcl_setting_renderer_freedreno</item>
@@ -53,6 +54,7 @@
         <item>opengles3_desktopgl_angle_vulkan</item>
 
         <item>virgl</item>
+        <item>virgl_a</item>
         <item>malihw_panfrost</item>
         <item>panfrost_neo</item>
         <item>adrhw_freedreno</item>

diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@
     <string name="mcl_setting_renderer_swrast">swrast (CPU) - (all versions, very slow)</string>
     <string name="mcl_setting_renderer_llvmpipe">llvmpipe (CPU) - (all versions, slow)</string>
     <string name="mcl_setting_renderer_virgl">virglrenderer - (1.7+ only, mid)</string>
+    <string name="mcl_setting_renderer_virgl_a">Ancient virglrenderer - (1.7+ only, slow)</string>
     <string name="mcl_setting_veroption_release">Release</string>
     <string name="mcl_setting_veroption_snapshot">Snapshot</string>
     <string name="mcl_setting_veroption_oldalpha">Old-alpha</string>