移除[渲染器]: 移除VKGL

Vera-Firefly · Nov 11, 2024 · 3b8f0a0 · 3b8f0a0
1 parent f77d110
commit 3b8f0a0
Show file tree

Hide file tree

Showing 8 changed files with 0 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
@@ -264,11 +264,6 @@ private static void setRendererEnv() throws Throwable {
             envMap.put("POJAVEXEC_EGL", "libltw.so");
         }
 
-        if (LOCAL_RENDERER.equals("opengles?_vkgl")) {
-            envMap.put("LIBGL_ES", "3");
-            envMap.put("POJAVEXEC_EGL", "libVKGL32_EGL.so");
-        }
-
         if (!LOCAL_RENDERER.startsWith("opengles")) {
             envMap.put("MESA_GLSL_CACHE_DIR", Tools.DIR_CACHE.getAbsolutePath());
             envMap.put("force_glsl_extensions_warn", "true");
@@ -691,9 +686,6 @@ 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/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
@@ -11,7 +11,6 @@
         <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">
@@ -55,7 +54,6 @@
         <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">