add UMP version of panfrost

currently not working and probably won't work for a while
SolDev69 · Jan 2, 2024 · eb83538 · eb83538
1 parent 87c5194
commit eb83538
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 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
@@ -459,6 +459,7 @@ public static String loadGraphicsLibrary(){
                 renderLibrary = "libOSMesa_pan.so"; break;
             case "vulkan_zink_legacy": 
                 renderLibrary = "libOSMesa_znL.so"; break;
+            case "malihw_panfrost-new":
             case "vulkan_zink":
             case "swrast":
             case "virgl":

diff --git a/app_pojavlauncher/src/main/jni/egl_bridge.c b/app_pojavlauncher/src/main/jni/egl_bridge.c
@@ -211,7 +211,7 @@ int pojavInitOpenGL() {
         setenv("MESA_LOADER_DRIVER_OVERRIDE","zink",1);
         setenv("GALLIUM_DRIVER","zink",1);
         set_osm_bridge_tbl();
-    } else if (strcmp(renderer, "malihw_panfrost") == 0) {
+    } else if (strcmp(renderer, "malihw_panfrost") == 0 || strcmp(renderer, "malihw_panfrost-new") == 0) {
         pojav_environ->config_renderer = RENDERER_VK_ZINK;
         setenv("GALLIUM_DRIVER", "panfrost", 1);
         setenv("PAN_DEBUG","gofaster",1);

diff --git a/app_pojavlauncher/src/main/res/values-en-rGB/strings.xml b/app_pojavlauncher/src/main/res/values-en-rGB/strings.xml
@@ -67,14 +67,6 @@
     <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_angle">ANGLE (Vulkan) - (1.17+ only, fast)</string>
-    <string name="mcl_setting_renderer_angle_new">Updated ANGLE (Vulkan) - (1.17+ only, mid)</string>
-    <string name="mcl_setting_renderer_panfrost">Panfrost (Mali Gx10 only) - (all versions, mid)</string>
-    <string name="mcl_setting_renderer_freedreno">Freedreno (Adreno) - (all versions, mid)</string>
-    <string name="mcl_setting_renderer_softpipe">softpipe (CPU) - (all versions, very slow)</string>
-
-    <string name="mcl_setting_renderer_virgl">virglrenderer (NOT IMPLEMENTED!) - (all versions, mid)</string>
-    <string name="mcl_setting_renderer_vulkan_zink_legacy">Legacy Zink (UNSUPPORTED AND BROKEN!) - (all versions, slow)</string>
-    <string name="mcl_setting_renderer_vgpu">vgpu - (up to 1.16.5, fast)</string>
 
     <string name="mcl_setting_veroption_release">Release</string>
     <string name="mcl_setting_veroption_snapshot">Snapshot</string>

diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -53,6 +53,7 @@
         <item>virgl</item> <!-- virglrenderer with OpenGL ES 3 -->
         <item>vulkan_zink_legacy</item>
         <item>vgpu</item>
+        <item>malihw_panfrost-new</item>
     </string-array>
     <string-array name="download_source_names">
         <item>@string/global_default</item>

diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -71,9 +71,9 @@
     <string name="mcl_setting_renderer_panfrost">Panfrost (Mali Gx10 only) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_freedreno">Freedreno (Adreno) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_softpipe">softpipe (CPU) - (all versions, very slow)</string>
-
     <string name="mcl_setting_renderer_virgl">virglrenderer (NOT IMPLEMENTED!) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_vulkan_zink_legacy">Legacy Zink (UNSUPPORTED AND BROKEN!) - (all versions, slow)</string>
+    <string name="mcl_setting_renderer_panfrost_new">Panfrost UMP (BROKEN!) - (all versions, mid)</string>
     <string name="mcl_setting_renderer_vgpu">vgpu - (up to 1.16.5, fast)</string>
 
     <string name="mcl_setting_veroption_release">Release</string>