Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New OpenGL version selection for SDL

Browse Source
This commit is contained in:
Anuken
2025-09-02 12:53:18 -04:00
parent 03544dda46
commit 7a1d126fcd
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/src/mindustry/desktop/DesktopLauncher.java
View File

@@ -47,13 +47,20 @@ public class DesktopLauncher extends ClientLauncher{
new SdlApplication(new DesktopLauncher(arg), new SdlConfig(){{
title = "Mindustry";
maximized = true;
coreProfile = true;
width = 900;
height = 700;
gl30Minor = 2;
//on Windows, Intel drivers might be buggy with OpenGL 3.x, so disable it. See https://github.com/Anuken/Mindustry/issues/11041
if(!GpuDetect.isIntel){
gl30 = true;
//on Windows, Intel drivers might be buggy with OpenGL 3.x, so only use 2.0. See https://github.com/Anuken/Mindustry/issues/11041
if(GpuDetect.isIntel){
coreProfile = false;
glVersions = new int[][]{{2, 0}};
}else if(OS.isMac){
//MacOS supports 4.1 at most
glVersions = new int[][]{{4, 1}, {3, 2}, {2, 0}};
}else{
//try essentially every OpenGL version
glVersions = new int[][]{{4, 6}, {4, 1}, {3, 3}, {3, 2}, {3, 1}, {2, 0}};
}
for(int i = 0; i < arg.length; i++){
@@ -62,11 +69,20 @@ public class DesktopLauncher extends ClientLauncher{
switch(name){
case "width" -> width = Strings.parseInt(arg[i + 1], width);
case "height" -> height = Strings.parseInt(arg[i + 1], height);
case "glMajor" -> gl30Major = Strings.parseInt(arg[i + 1], gl30Major);
case "glMinor" -> gl30Minor = Strings.parseInt(arg[i + 1], gl30Minor);
case "gl3" -> gl30 = true;
case "gl2" -> gl30 = false;
case "gl" -> {
String str = arg[i + 1];
if(str.contains(".")){
String[] split = str.split("\\.");
if(split.length == 2 && Strings.canParsePositiveInt(split[0]) && Strings.canParsePositiveInt(split[1])){
glVersions = new int[][]{{Strings.parseInt(split[0]), Strings.parseInt(split[1])}};
break;
}
}
Log.err("Invalid GL version format string: '@'. GL version must be of the form <major>.<minor>", str);
}
case "coreGl" -> coreProfile = true;
case "compatibilityGl" -> coreProfile = false;
case "antialias" -> samples = 16;
case "debug" -> Log.level = LogLevel.debug;
case "maximized" -> maximized = Boolean.parseBoolean(arg[i + 1]);