From 4a1c7de57c53af429a3523bdcbef65c8c791f09f Mon Sep 17 00:00:00 2001
From: clayjohn <claynjohn@gmail.com>
Date: Wed, 7 Sep 2022 17:44:36 -0700
Subject: Split rendering driver project setting into renderer_name and
 rendering_driver. To differentiate between a driver (e.g. Vulkan or D3D12)
 and a renderer (e.g. clustered or mobile renderer).

---
 platform/android/export/export_plugin.cpp                      | 9 +--------
 platform/android/export/gradle_export_util.cpp                 | 4 +---
 platform/android/java/lib/src/org/godotengine/godot/Godot.java | 8 ++++----
 3 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'platform/android')

diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index e5656bd00b..366bd1c48c 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -1669,14 +1669,7 @@ Vector<String> EditorExportPlatformAndroid::get_enabled_abis(const Ref<EditorExp
 }
 
 void EditorExportPlatformAndroid::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const {
-	String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
-	if (driver == "opengl3") {
-		r_features->push_back("etc");
-	}
-	// FIXME: Review what texture formats are used for Vulkan.
-	if (driver == "vulkan") {
-		r_features->push_back("etc2");
-	}
+	r_features->push_back("etc2");
 
 	Vector<String> abis = get_enabled_abis(p_preset);
 	for (int i = 0; i < abis.size(); ++i) {
diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp
index 8d370a31a4..2f53942f76 100644
--- a/platform/android/export/gradle_export_util.cpp
+++ b/platform/android/export/gradle_export_util.cpp
@@ -189,9 +189,7 @@ String bool_to_string(bool v) {
 }
 
 String _get_gles_tag() {
-	bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/driver/driver_name") == "GLES3" &&
-			!ProjectSettings::get_singleton()->get("rendering/driver/fallback_to_gles2");
-	return min_gles3 ? "    <uses-feature android:glEsVersion=\"0x00030000\" android:required=\"true\" />\n" : "";
+	return "    <uses-feature android:glEsVersion=\"0x00030000\" android:required=\"true\" />\n";
 }
 
 String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset) {
diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.java b/platform/android/java/lib/src/org/godotengine/godot/Godot.java
index a75c69484c..92e5e59496 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/Godot.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.java
@@ -274,11 +274,11 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
 			return false;
 		}
 
-		final String videoDriver = GodotLib.getGlobal("rendering/driver/driver_name");
-		if (videoDriver.equals("vulkan")) {
-			mRenderView = new GodotVulkanRenderView(activity, this);
-		} else {
+		final String renderer = GodotLib.getGlobal("rendering/renderer/rendering_method");
+		if (renderer.equals("gl_compatibility")) {
 			mRenderView = new GodotGLRenderView(activity, this, xrMode, use_debug_opengl);
+		} else {
+			mRenderView = new GodotVulkanRenderView(activity, this);
 		}
 
 		View view = mRenderView.getView();
-- 
cgit v1.2.3