Feat[egl_bridge]: simplify ZINK_PREFER_SYSTEM_DRIVER handling

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

View File

@ -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");
}

View File

@ -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) {