From bff49a7ed6ffef83810cd949b6a8514a0914f93a Mon Sep 17 00:00:00 2001 From: artdeell Date: Mon, 20 Jan 2025 16:49:12 +0300 Subject: [PATCH] Feat[egl_bridge]: simplify ZINK_PREFER_SYSTEM_DRIVER handling --- .../src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java | 4 +--- app_pojavlauncher/src/main/jni/egl_bridge.c | 3 +-- 2 files changed, 2 insertions(+), 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 index ebb8a8a9d..016d8483c 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 @@ -192,8 +192,6 @@ public class JREUtils { if(PREF_DUMP_SHADERS) envMap.put("LIBGL_VGPU_DUMP", "1"); - if(PREF_ZINK_PREFER_SYSTEM_DRIVER) - envMap.put("POJAV_ZINK_PREFER_SYSTEM_DRIVER", "1"); if(PREF_VSYNC_IN_ZINK) envMap.put("POJAV_VSYNC_IN_ZINK", "1"); if(Tools.deviceHasHangingLinker()) @@ -258,7 +256,7 @@ public class JREUtils { } } - if(info.vendor.equals("Qualcomm") && info.renderer.contains("Adreno")) { + if(info.vendor.equals("Qualcomm") && info.renderer.contains("Adreno") && !PREF_ZINK_PREFER_SYSTEM_DRIVER) { envMap.put("POJAV_LOAD_TURNIP", "1"); } diff --git a/app_pojavlauncher/src/main/jni/egl_bridge.c b/app_pojavlauncher/src/main/jni/egl_bridge.c index 80908d405..b1d56b8f0 100644 --- a/app_pojavlauncher/src/main/jni/egl_bridge.c +++ b/app_pojavlauncher/src/main/jni/egl_bridge.c @@ -139,8 +139,7 @@ static void set_vulkan_ptr(void* ptr) { } void load_vulkan() { - if(getenv("POJAV_ZINK_PREFER_SYSTEM_DRIVER") == NULL && - android_get_device_api_level() >= 28) { // the loader does not support below that + if(android_get_device_api_level() >= 28) { // the loader does not support below that #ifdef ADRENO_POSSIBLE void* result = load_turnip_vulkan(); if(result != NULL) {