TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-09 20:51:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Feat[egl_bridge]: simplify ZINK_PREFER_SYSTEM_DRIVER handling

Browse Source
This commit is contained in:
artdeell 2025-01-20 16:49:12 +03:00 committed by Maksim Belov
parent a9815b2ac9
commit bff49a7ed6
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -192,8 +192,6 @@ public class JREUtils {
if(PREF_DUMP_SHADERS) if(PREF_DUMP_SHADERS)
envMap.put("LIBGL_VGPU_DUMP", "1"); 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) if(PREF_VSYNC_IN_ZINK)
envMap.put("POJAV_VSYNC_IN_ZINK", "1"); envMap.put("POJAV_VSYNC_IN_ZINK", "1");
if(Tools.deviceHasHangingLinker()) 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"); envMap.put("POJAV_LOAD_TURNIP", "1");
} }

3
app_pojavlauncher/src/main/jni/egl_bridge.c
View File

@ -139,8 +139,7 @@ static void set_vulkan_ptr(void* ptr) {
} }
void load_vulkan() { void load_vulkan() {
if(getenv("POJAV_ZINK_PREFER_SYSTEM_DRIVER") == NULL && if(android_get_device_api_level() >= 28) { // the loader does not support below that
android_get_device_api_level() >= 28) { // the loader does not support below that
#ifdef ADRENO_POSSIBLE #ifdef ADRENO_POSSIBLE
void* result = load_turnip_vulkan(); void* result = load_turnip_vulkan();
if(result != NULL) { if(result != NULL) {