From 2662228becf4e1506b0b53e34c21f66c0084a360 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 10 Jun 2020 15:31:43 -0400 Subject: [PATCH] Use GL3.0 for all platforms --- android/src/mindustry/android/AndroidLauncher.java | 1 + desktop/src/mindustry/desktop/DesktopLauncher.java | 1 + gradle.properties | 2 +- ios/src/mindustry/ios/IOSLauncher.java | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 4d41e46cb4..2d8ba2605c 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -146,6 +146,7 @@ public class AndroidLauncher extends AndroidApplication{ }, new AndroidApplicationConfiguration(){{ useImmersiveMode = true; hideStatusBar = true; + useGL30 = true; errorHandler = CrashSender::log; stencil = 8; }}); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index bae54f56b2..02e49f90be 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -40,6 +40,7 @@ public class DesktopLauncher extends ClientLauncher{ new SdlApplication(new DesktopLauncher(arg), new SdlConfig(){{ title = "Mindustry"; maximized = true; + gl30 = true; stencil = 8; width = 900; height = 700; diff --git a/gradle.properties b/gradle.properties index 77aec5f153..e35348d102 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=687070d8d8e81d8d89156062eabf017fde9408ed +archash=bcc8e00e80e3d61bfaf612122ebe0adb5b18105b diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index 4b43b1c305..74595e55cf 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -172,7 +172,7 @@ public class IOSLauncher extends IOSApplication.Delegate{ UINavigationController.attemptRotationToDeviceOrientation(); } }, new IOSApplicationConfiguration(){{ - //errorHandler = ModCrashHandler::handle; + useGL30 = true; }}); }