Use OpenGL ES graphics backend per default on Android

As Vulkan crashes immediately on launch on a lot of Android devices (for around 15% of users that commented on the Android beta on Discord). The previous usage of the OpenGL backend in the shortcuts was incorrect, as this backend is not strictly available on Android and the GLES backend should be used instead, as this is also what is displayed in the graphics settings.
Robyt3 · Sep 24, 2024 · 2d08f44 · 2d08f44
1 parent 193b33b
commit 2d08f44
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/scripts/android/files/java/org/ddnet/client/NativeMain.java b/scripts/android/files/java/org/ddnet/client/NativeMain.java
@@ -29,8 +29,8 @@ public void onCreate(Bundle SavedInstanceState) {
 			if(gfxBackend != null) {
 				if(gfxBackend.equals("Vulkan")) {
 					launchArguments = new String[] {"gfx_backend Vulkan"};
-				} else if(gfxBackend.equals("OpenGL")) {
-					launchArguments = new String[] {"gfx_backend OpenGL"};
+				} else if(gfxBackend.equals("GLES")) {
+					launchArguments = new String[] {"gfx_backend GLES"};
 				}
 			}
 		}

diff --git a/scripts/android/files/res/values/strings.xml b/scripts/android/files/res/values/strings.xml
@@ -2,5 +2,5 @@
 <resources>
 	<string name="app_name">DDNet</string>
 	<string name="shortcut_play_vulkan_short">Play (Vulkan)</string>
-	<string name="shortcut_play_opengl_short">Play (OpenGL)</string>
+	<string name="shortcut_play_gles_short">Play (GLES)</string>
 </resources>
diff --git a/scripts/android/files/res/xml/shortcuts.xml b/scripts/android/files/res/xml/shortcuts.xml
@@ -14,17 +14,17 @@
 		</intent>
 	</shortcut>
 	<shortcut
-		android:shortcutId="play-opengl"
+		android:shortcutId="play-gles"
 		android:enabled="true"
 		android:icon="@mipmap/ic_launcher"
-		android:shortcutShortLabel="@string/shortcut_play_opengl_short">
+		android:shortcutShortLabel="@string/shortcut_play_gles_short">
 		<intent
 			android:action="android.intent.action.VIEW"
 			android:targetPackage="org.ddnet.client"
 			android:targetClass="org.ddnet.client.NativeMain">
 			<extra
 				android:name="gfx-backend"
-				android:value="OpenGL" />
+				android:value="GLES" />
 		</intent>
 	</shortcut>
 </shortcuts>
diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h
@@ -717,7 +717,9 @@ MACRO_CONFIG_STR(Gfx3DTextureAnalysisRenderer, gfx_3d_texture_analysis_renderer,
 MACRO_CONFIG_STR(Gfx3DTextureAnalysisVersion, gfx_3d_texture_analysis_version, 128, "", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The version on which the analysis was performed")
 
 MACRO_CONFIG_STR(GfxGpuName, gfx_gpu_name, 256, "auto", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The GPU's name, which will be selected by the backend. (if supported by the backend)")
-#if !defined(CONF_ARCH_IA32) && !defined(CONF_PLATFORM_MACOS)
+#if defined(CONF_PLATFORM_ANDROID)
+MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "GLES", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. GLES or Vulkan)")
+#elif !defined(CONF_ARCH_IA32) && !defined(CONF_PLATFORM_MACOS)
 MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "Vulkan", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")
 #else
 MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "OpenGL", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")