edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-10-18 14:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9030 from Robyt3/Android-OpenGL-Default

Browse source 
Use OpenGL ES graphics backend per default on Android
This commit is contained in:
heinrich5991 2024-09-24 15:42:10 +00:00 committed by GitHub
parent 193b33b0d7 24ebb54971
commit 9298ee485e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/android/files/java/org/ddnet/client/NativeMain.java
View file

@ -29,8 +29,8 @@ public class NativeMain extends SDLActivity {
if(gfxBackend != null) { if(gfxBackend != null) {
if(gfxBackend.equals("Vulkan")) { if(gfxBackend.equals("Vulkan")) {
launchArguments = new String[] {"gfx_backend Vulkan"}; launchArguments = new String[] {"gfx_backend Vulkan"};
} else if(gfxBackend.equals("OpenGL")) { } else if(gfxBackend.equals("GLES")) {
launchArguments = new String[] {"gfx_backend OpenGL"}; launchArguments = new String[] {"gfx_backend GLES"};
} }
} }
} }

2
scripts/android/files/res/values/strings.xml
View file

@ -2,5 +2,5 @@
<resources> <resources>
<string name="app_name">DDNet</string> <string name="app_name">DDNet</string>
<string name="shortcut_play_vulkan_short">Play (Vulkan)</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 (OpenGL ES)</string>
</resources> </resources>

6
scripts/android/files/res/xml/shortcuts.xml
View file

@ -14,17 +14,17 @@
</intent> </intent>
</shortcut> </shortcut>
<shortcut <shortcut
android:shortcutId="play-opengl" android:shortcutId="play-gles"
android:enabled="true" android:enabled="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:shortcutShortLabel="@string/shortcut_play_opengl_short"> android:shortcutShortLabel="@string/shortcut_play_gles_short">
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:targetPackage="org.ddnet.client" android:targetPackage="org.ddnet.client"
android:targetClass="org.ddnet.client.NativeMain"> android:targetClass="org.ddnet.client.NativeMain">
<extra <extra
android:name="gfx-backend" android:name="gfx-backend"
android:value="OpenGL" /> android:value="GLES" />
</intent> </intent>
</shortcut> </shortcut>
</shortcuts> </shortcuts>

4
src/engine/shared/config_variables.h
View file

@ -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(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)") 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)") MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "Vulkan", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")
#else #else
MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "OpenGL", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)") MACRO_CONFIG_STR(GfxBackend, gfx_backend, 256, "OpenGL", CFGFLAG_SAVE | CFGFLAG_CLIENT, "The backend to use (e.g. OpenGL or Vulkan)")