更新Turnip驱动 & 添加实验性渲染器VKGL

Vera-Firefly · Oct 28, 2024 · 5c5c2fb · 5c5c2fb
1 parent 3b7c609
commit 5c5c2fb
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 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
@@ -262,6 +262,9 @@ public static void setJavaEnvironment(String jreHome) throws Throwable {
                 envMap.put("LIBGL_ES", "3");
                 envMap.put("POJAVEXEC_EGL", "libltw.so"); // Use ANGLE EGL
             }
+
+            if (LOCAL_RENDERER.equals("opengles?_vkgl"))
+                envMap.put("POJAVEXEC_EGL", "libVKGL32_EGL.so");
         }
 
         File customEnvFile = new File(ProfilePathManager.getCurrentPath(), "custom_env.txt");
@@ -664,7 +667,7 @@ public static String loadGraphicsLibrary() {
                     break;
                 case "vulkan_zink":
                 case "freedreno":
-                    renderLibrary = "libOSMesa_8.so";
+                    renderLibrary = "libOSMesa_2304.so";
                     break;
                 case "virglrenderer":
                     renderLibrary = "libOSMesa_2205.so";
@@ -675,6 +678,9 @@ public static String loadGraphicsLibrary() {
                 case "opengles3_ltw":
                     renderLibrary = "libltw.so";
                     break;
+                case "opengles?_vkgl":
+                    renderLibrary = "libVKGL32.so";
+                    break;
                 default:
                     Log.w("RENDER_LIBRARY", "No renderer selected, defaulting to opengles2");
                     renderLibrary = "libgl4es_114.so";

diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32_EGL.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32_EGL.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32_EGL.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32_EGL.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32_EGL.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32_EGL.so
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -2,7 +2,7 @@
 <resources>
     <string-array name="renderer">
         <item name="0">@string/mcl_setting_renderer_gles2_4</item>
-        <item name="1">GL4ES Ptitseb (OpenGL3.3)</item>
+        <item name="1">GL4ES Ptitseb1.1.7 (1.17-, OpenGL3.3)</item>
         <item name="2">@string/mcl_setting_renderer_vgpu</item>
         <item name="3">VGPU 1.3.6β</item>
         <item name="4">Mesa 3D</item>
@@ -11,6 +11,7 @@
         <item name="7">@string/mcl_setting_renderer_freedreno</item>
         <item name="8">@string/mcl_setting_renderer_panfrost</item>
         <item name="9">@string/mcl_setting_renderer_ltw</item>
+        <item name="10">VKGL</item>
     </string-array>
 
     <string-array name="menu_customcontrol">
@@ -45,15 +46,16 @@
 
     <string-array name="renderer_values">
         <item>opengles2</item> <!-- gl4es_extra 1.1.4 with OpenGL ES 2/"3" -->
-        <item>opengles2_ptitseb</item>
-        <item>opengles2_vgpu</item> <!-- vgpurenderer with OpenGL ES 2 OpenGL4.4 -->
-        <item>opengles2_vgpu_1</item>
-        <item>mesa_3d</item>
-        <item>vulkan_zink</item> <!-- zinkrenderer with Vulkan OpenGL4.6 -->
+        <item>opengles2_ptitseb</item> <!-- gl4es ptitseb with OpenGL ES 2 -->
+        <item>opengles2_vgpu</item> <!-- Vgpu renderer with OpenGL ES 2 OpenGL 4.4 -->
+        <item>opengles2_vgpu_1</item> <!-- Vgpu renderer with OpenGL ES2 OpenGL 3.0 -->
+        <item>mesa_3d</item> <!-- Mesa3D Library -->
+        <item>vulkan_zink</item> <!-- Zink renderer with Vulkan OpenGL4.6 -->
         <item>virglrenderer</item> <!-- virglrenderer with OpenGL ES 3 -->
-        <item>freedreno</item>
-        <item>panfrost</item>
-        <item>opengles3_ltw</item>
+        <item>freedreno</item> <!-- Gallium Freedreno with Adreno GPU -->
+        <item>panfrost</item> <!-- Gallium Panfrost with Mali GPU -->
+        <item>opengles3_ltw</item> <!-- Unknown -->
+        <item>opengles?_vkgl</item> <!-- Unknown -->
     </string-array>
 
     <string-array name="download_source_names">