add expimental zink

based off of mesa 24.1.0-devel
SolDev69 · Apr 13, 2024 · 8d49afc · 8d49afc
1 parent 9ec3ed0
commit 8d49afc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -452,6 +452,7 @@ public static String loadGraphicsLibrary(){
             case "opengles3":
                 renderLibrary = "libgl4es_114.so"; break;
             case "vulkan_zink": renderLibrary = "libOSMesa.so"; break;
+            case "vulkan_zink_dev": renderLibrary = "libOSMesa_dev.so"; break;
             case "opengles3_desktopgl_angle_vulkan" : renderLibrary = "libtinywrapper.so"; break;
             default:
                 Log.w("RENDER_LIBRARY", "No renderer selected, defaulting to opengles2");

diff --git a/app_solcraftlauncher/src/main/jni/egl_bridge.c b/app_solcraftlauncher/src/main/jni/egl_bridge.c
@@ -200,10 +200,11 @@ int pojavInitOpenGL() {
     if (strncmp("opengles", renderer, 8) == 0) {
         pojav_environ->config_renderer = RENDERER_GL4ES;
         set_gl_bridge_tbl();
-    } else if (strcmp(renderer, "vulkan_zink") == 0) {
+    } else if (strcmp(renderer, "vulkan_zink") == 0 || strcmp(renderer, "vulkan_zink_dev") == 0) {
         pojav_environ->config_renderer = RENDERER_VK_ZINK;
         load_vulkan();
         setenv("GALLIUM_DRIVER","zink",1);
+        setenv("MESA_LOADER_DRIVER_OVERRIDE", "zink", 1);
         set_osm_bridge_tbl();
     }
     if(br_init()) {

diff --git a/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libOSMesa_dev.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libOSMesa_dev.so
diff --git a/app_solcraftlauncher/src/main/res/values/headings_array.xml b/app_solcraftlauncher/src/main/res/values/headings_array.xml
@@ -4,6 +4,8 @@
         <item name="1">@string/mcl_setting_renderer_gles2_4</item>
         <item name="2">@string/mcl_setting_renderer_vulkan_zink</item>
         <item name="3">@string/mcl_setting_renderer_angle</item>
+        <item name="4">@string/mcl_setting_renderer_vulkan_zink_dev</item>
+
     </string-array>
 
     <string-array name="menu_customcontrol">
@@ -36,9 +38,10 @@
     </string-array>
 
     <string-array name="renderer_values">
-        <item>opengles2</item> <!-- gl4es_extra 1.1.4 with OpenGL ES 2/"3" -->
-        <item>vulkan_zink</item> <!-- virglrenderer with OpenGL ES 3 -->
+        <item>opengles2</item> <!-- gl4es_pojav 1.1.5 with OpenGL ES 2/"3" -->
+        <item>vulkan_zink</item> <!-- zink mesa 23.0.4 -->
         <item>opengles3_desktopgl_angle_vulkan</item>
+        <item>vulkan_zink_dev></item>
     </string-array>
     <string-array name="download_source_names">
         <item>@string/global_default</item>

diff --git a/app_solcraftlauncher/src/main/res/values/strings.xml b/app_solcraftlauncher/src/main/res/values/strings.xml
@@ -66,6 +66,7 @@
     <string name="mcl_setting_category_renderer">Renderer</string>
     <string name="mcl_setting_renderer_gles2_4">Holy GL4ES - (all versions, fast)</string>
     <string name="mcl_setting_renderer_vulkan_zink">Zink (Vulkan) - (all versions, mid)</string>
+    <string name="mcl_setting_renderer_vulkan_zink_dev">Experimental Zink (Vulkan, Adreno) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_angle">ANGLE (Vulkan) - (1.17+ only, mid)</string>
     <string name="mcl_setting_veroption_release">Release</string>
     <string name="mcl_setting_veroption_snapshot">Snapshot</string>