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 index 3befbc49..6911be20 100644 --- 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 new file mode 100644 index 00000000..0afb40d4 Binary files /dev/null and b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32_EGL.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32_EGL.so new file mode 100644 index 00000000..b0a8ffd9 Binary files /dev/null and b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVKGL32_EGL.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so index be80320a..ec5247e2 100644 Binary files a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so and b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32.so new file mode 100644 index 00000000..d318f6da Binary files /dev/null and b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32_EGL.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32_EGL.so new file mode 100644 index 00000000..77f450bc Binary files /dev/null and b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libVKGL32_EGL.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32.so new file mode 100644 index 00000000..3107dbe1 Binary files /dev/null and b/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32.so differ diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32_EGL.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32_EGL.so new file mode 100644 index 00000000..afab21cc Binary files /dev/null and b/app_pojavlauncher/src/main/jniLibs/x86_64/libVKGL32_EGL.so differ diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml index 18eeef0f..2ec6b201 100644 --- a/app_pojavlauncher/src/main/res/values/headings_array.xml +++ b/app_pojavlauncher/src/main/res/values/headings_array.xml @@ -2,7 +2,7 @@ @string/mcl_setting_renderer_gles2_4 - GL4ES Ptitseb (OpenGL3.3) + GL4ES Ptitseb1.1.7 (1.17-, OpenGL3.3) @string/mcl_setting_renderer_vgpu VGPU 1.3.6β Mesa 3D @@ -11,6 +11,7 @@ @string/mcl_setting_renderer_freedreno @string/mcl_setting_renderer_panfrost @string/mcl_setting_renderer_ltw + VKGL @@ -45,15 +46,16 @@ opengles2 - opengles2_ptitseb - opengles2_vgpu - opengles2_vgpu_1 - mesa_3d - vulkan_zink + opengles2_ptitseb + opengles2_vgpu + opengles2_vgpu_1 + mesa_3d + vulkan_zink virglrenderer - freedreno - panfrost - opengles3_ltw + freedreno + panfrost + opengles3_ltw + opengles?_vkgl