diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 11:24:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 11:24:15 +0100 |
| commit | 2f6ca917f75ca6bfbe28f4749825fdabde1d0531 (patch) | |
| tree | a263613010c3e303d4ec8a3a45bd98a19f5f42c3 /platform/android/export | |
| parent | f505aae1d820f0d083ca0fdaa6fa2da7a3988db1 (diff) | |
| parent | 386968ea97d4ceeb004cc05a7aa740aa7abe6ca9 (diff) | |
| download | redot-engine-2f6ca917f75ca6bfbe28f4749825fdabde1d0531.tar.gz | |
Merge pull request #36174 from akien-mga/byebye-openghell-3
Remove obsolete GLES3 backend
Diffstat (limited to 'platform/android/export')
| -rw-r--r-- | platform/android/export/export.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 7bbcb8cfa2..642b045f5b 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -683,8 +683,6 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { int orientation = p_preset->get("screen/orientation"); - bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name") == "GLES3" && - !ProjectSettings::get_singleton()->get("rendering/quality/driver/fallback_to_gles2"); bool screen_support_small = p_preset->get("screen/support_small"); bool screen_support_normal = p_preset->get("screen/support_normal"); bool screen_support_large = p_preset->get("screen/support_large"); @@ -839,11 +837,6 @@ class EditorExportPlatformAndroid : public EditorExportPlatform { } } - if (tname == "uses-feature" && attrname == "glEsVersion") { - - encode_uint32(min_gles3 ? 0x00030000 : 0x00020000, &p_manifest.write[iofs + 16]); - } - // FIXME: `attr_value != 0xFFFFFFFF` below added as a stopgap measure for GH-32553, // but the issue should be debugged further and properly addressed. if (tname == "meta-data" && attrname == "name" && value == "xr_mode_metadata_name") { @@ -1350,11 +1343,10 @@ public: String driver = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name"); if (driver == "GLES2") { r_features->push_back("etc"); - } else if (driver == "GLES3") { + } + // FIXME: Review what texture formats are used for Vulkan. + if (driver == "Vulkan") { r_features->push_back("etc2"); - if (ProjectSettings::get_singleton()->get("rendering/quality/driver/fallback_to_gles2")) { - r_features->push_back("etc"); - } } Vector<String> abis = get_enabled_abis(p_preset); |