From c91f3f99fdd81e37527b7208fbf0b6287421d779 Mon Sep 17 00:00:00 2001
From: ROllerozxa <rollerozxa@voxelmanip.se>
Date: Sun, 5 Mar 2023 15:07:40 +0100
Subject: [PATCH] Minor adjustments now that OpenGLES 2 is the default driver
 on Android (#12391)

---
 android/app/src/main/AndroidManifest.xml | 1 +
 builtin/settingtypes.txt                 | 7 +++----
 src/defaultsettings.cpp                  | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 11c868622..f31810a17 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-feature android:glEsVersion="0x00020000" />
 
 	<!--
 		`android:requestLegacyExternalStorage="true"` is workaround for using `/sdcard`
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 262e5ba50..962261ed4 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -1649,10 +1649,9 @@ ignore_world_load_errors (Ignore world errors) bool false
 shader_path (Shader path) path
 
 #    The rendering back-end.
-#    A restart is required after changing this.
-#    Note: On Android, stick with OGLES1 if unsure! App may fail to start otherwise.
-#    On other platforms, OpenGL is recommended.
-#    Shaders are supported by OpenGL (desktop only) and OGLES2 (experimental)
+#    Note: A restart is required after changing this!
+#    OpenGL is the default for desktop, and OGLES2 for Android.
+#    Shaders are supported by OpenGL and OGLES2 (experimental).
 video_driver (Video driver) enum opengl opengl,ogles1,ogles2
 
 #    Distance in nodes at which transparency depth sorting is enabled
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 8e25eab81..5710b731a 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -245,11 +245,7 @@ void set_default_settings()
 	settings->setDefault("texture_clean_transparent", "false");
 	settings->setDefault("texture_min_size", "64");
 	settings->setDefault("ambient_occlusion_gamma", "1.8");
-#if ENABLE_GLES
-	settings->setDefault("enable_shaders", "false");
-#else
 	settings->setDefault("enable_shaders", "true");
-#endif
 	settings->setDefault("enable_particles", "true");
 	settings->setDefault("arm_inertia", "true");
 	settings->setDefault("show_nametag_backgrounds", "true");
-- 
2.44.0