From bd610b6925f265c50244c5852051c70ce04f1d6f Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 8 May 2024 20:15:14 -0400 Subject: [PATCH] Request a GL 3 context by default --- android/src/mindustry/android/AndroidLauncher.java | 1 + desktop/src/mindustry/desktop/DesktopLauncher.java | 4 ++++ ios/src/mindustry/ios/IOSLauncher.java | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 7febad64a7..fdb8a4ec56 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -184,6 +184,7 @@ public class AndroidLauncher extends AndroidApplication{ }, new AndroidApplicationConfiguration(){{ useImmersiveMode = true; hideStatusBar = true; + useGL30 = true; }}); checkFiles(getIntent()); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index 250d7e0a01..44f3b5b03f 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -41,6 +41,9 @@ public class DesktopLauncher extends ClientLauncher{ maximized = true; width = 900; height = 700; + //request 3.1, which has instancing + gl30Minor = 1; + gl30 = true; for(int i = 0; i < arg.length; i++){ if(arg[i].charAt(0) == '-'){ String name = arg[i].substring(1); @@ -49,6 +52,7 @@ public class DesktopLauncher extends ClientLauncher{ case "width": width = Integer.parseInt(arg[i + 1]); break; case "height": height = Integer.parseInt(arg[i + 1]); break; case "gl3": gl30 = true; break; + case "gl2": gl30 = false; break; case "antialias": samples = 16; break; case "debug": Log.level = LogLevel.debug; break; case "maximized": maximized = Boolean.parseBoolean(arg[i + 1]); break; diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index f6a2834b9f..cf1b6b8208 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -174,7 +174,9 @@ public class IOSLauncher extends IOSApplication.Delegate{ forced = false; UINavigationController.attemptRotationToDeviceOrientation(); } - }, new IOSApplicationConfiguration()); + }, new IOSApplicationConfiguration(){{ + useGL30 = true; + }}); } @Override