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

Freat[misc_settings]: check for Turnip compatibility to hide the driver option

Browse Source
This commit is contained in:
artdeell 2025-01-20 21:06:29 +03:00 committed by Maksim Belov
parent bff49a7ed6
commit a39cd84e08
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -22,11 +22,6 @@ import android.database.Cursor;
import android.hardware.Sensor; import android.hardware.Sensor;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.net.Uri; import android.net.Uri;
import android.opengl.EGL14;
import android.opengl.EGLConfig;
import android.opengl.EGLContext;
import android.opengl.EGLDisplay;
import android.opengl.GLES30;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
@ -48,10 +43,6 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowInsetsControllerCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@ -242,8 +233,8 @@ public final class Tools {
* @return whether the GPU is affected by the Large Thin Wrapper render distance issue on vanilla * @return whether the GPU is affected by the Large Thin Wrapper render distance issue on vanilla
*/ */
private static boolean affectedByRenderDistanceIssue() { private static boolean affectedByRenderDistanceIssue() {
GLInfoUtils.GLInfo info = GLInfoUtils.getInfo(); GLInfoUtils.GLInfo info = GLInfoUtils.getGlInfo();
return info.renderer.contains("Adreno") && info.vendor.equals("Qualcomm") && info.glesMajorVersion >= 3; return info.isAdreno() && info.glesMajorVersion >= 3;
} }
private static boolean checkRenderDistance(File gamedir) { private static boolean checkRenderDistance(File gamedir) {
@ -1035,7 +1026,7 @@ public final class Tools {
Logger.appendToLog("Info: API version: " + SDK_INT); Logger.appendToLog("Info: API version: " + SDK_INT);
Logger.appendToLog("Info: Selected Minecraft version: " + gameVersion); Logger.appendToLog("Info: Selected Minecraft version: " + gameVersion);
Logger.appendToLog("Info: Custom Java arguments: \"" + javaArguments + "\""); Logger.appendToLog("Info: Custom Java arguments: \"" + javaArguments + "\"");
GLInfoUtils.GLInfo info = GLInfoUtils.getInfo(); GLInfoUtils.GLInfo info = GLInfoUtils.getGlInfo();
Logger.appendToLog("Info: Graphics device: "+info.vendor+ " "+info.renderer+" (OpenGL ES "+info.glesMajorVersion+")"); Logger.appendToLog("Info: Graphics device: "+info.vendor+ " "+info.renderer+" (OpenGL ES "+info.glesMajorVersion+")");
} }

8
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceMiscellaneousFragment.java
View File

@ -1,19 +1,21 @@
package net.kdt.pojavlaunch.prefs.screens; package net.kdt.pojavlaunch.prefs.screens;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import androidx.preference.Preference; import androidx.preference.Preference;
import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.R;
import net.kdt.pojavlaunch.Tools; import net.kdt.pojavlaunch.Tools;
import net.kdt.pojavlaunch.utils.GLInfoUtils;
public class LauncherPreferenceMiscellaneousFragment extends LauncherPreferenceFragment { public class LauncherPreferenceMiscellaneousFragment extends LauncherPreferenceFragment {
@Override @Override
public void onCreatePreferences(Bundle b, String str) { public void onCreatePreferences(Bundle b, String str) {
addPreferencesFromResource(R.xml.pref_misc); addPreferencesFromResource(R.xml.pref_misc);
Preference driverPreference = requirePreference("zinkPreferSystemDriver"); Preference driverPreference = requirePreference("zinkPreferSystemDriver");
if(!Tools.checkVulkanSupport(driverPreference.getContext().getPackageManager())) { PackageManager packageManager = driverPreference.getContext().getPackageManager();
driverPreference.setVisible(false); boolean supportsTurnip = Tools.checkVulkanSupport(packageManager) && GLInfoUtils.getGlInfo().isAdreno();
} driverPreference.setVisible(supportsTurnip);
} }
} }

15
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/GLInfoUtils.java
View File

@ -99,7 +99,12 @@ public class GLInfoUtils {
return true; return true;
} }
public static GLInfo getInfo() { /**
* Get the information about the current OpenGL ES device, which consists of the vendor,
* the renderer and the major GLES version
* @return the info
*/
public static GLInfo getGlInfo() {
if(info != null) return info; if(info != null) return info;
Log.i("GLInfoUtils", "Querying graphics device info..."); Log.i("GLInfoUtils", "Querying graphics device info...");
boolean infoQueryResult = false; boolean infoQueryResult = false;
@ -121,5 +126,13 @@ public class GLInfoUtils {
this.renderer = renderer; this.renderer = renderer;
this.glesMajorVersion = glesMajorVersion; this.glesMajorVersion = glesMajorVersion;
} }
/**
* Check if this GLInfo belongs to a Qualcomm Adreno graphics adapter
* @return
*/
public boolean isAdreno() {
return renderer.contains("Adreno") && vendor.equals("Qualcomm");
}
} }
} }

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

@ -32,11 +32,6 @@ import net.kdt.pojavlaunch.plugins.FFmpegPlugin;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext;
import javax.microedition.khronos.egl.EGLDisplay;
public class JREUtils { public class JREUtils {
private JREUtils() {} private JREUtils() {}
@ -239,7 +234,7 @@ public class JREUtils {
reader.close(); reader.close();
} }
GLInfoUtils.GLInfo info = GLInfoUtils.getInfo(); GLInfoUtils.GLInfo info = GLInfoUtils.getGlInfo();
if(!envMap.containsKey("LIBGL_ES") && LOCAL_RENDERER != null) { if(!envMap.containsKey("LIBGL_ES") && LOCAL_RENDERER != null) {
int glesMajor = info.glesMajorVersion; int glesMajor = info.glesMajorVersion;
Log.i("glesDetect","GLES version detected: "+glesMajor); Log.i("glesDetect","GLES version detected: "+glesMajor);
@ -256,7 +251,7 @@ public class JREUtils {
} }
} }
if(info.vendor.equals("Qualcomm") && info.renderer.contains("Adreno") && !PREF_ZINK_PREFER_SYSTEM_DRIVER) { if(info.isAdreno() && !PREF_ZINK_PREFER_SYSTEM_DRIVER) {
envMap.put("POJAV_LOAD_TURNIP", "1"); envMap.put("POJAV_LOAD_TURNIP", "1");
} }
@ -517,7 +512,7 @@ public class JREUtils {
} }
public static int getDetectedVersion() { public static int getDetectedVersion() {
return GLInfoUtils.getInfo().glesMajorVersion; return GLInfoUtils.getGlInfo().glesMajorVersion;
} }
public static native int chdir(String path); public static native int chdir(String path);
public static native boolean dlopen(String libPath); public static native boolean dlopen(String libPath);