From ce97ddbcb125228cc88fbfdcae932e110ee7daee Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 27 Sep 2021 01:07:10 +0200 Subject: Rename GLES2 driver to OpenGL to prepare for the upgrade to GLES3 - Use lowercase driver names for the `--rendering-driver` command line argument. --- platform/android/display_server_android.cpp | 6 +++--- platform/android/export/export.cpp | 18 +++++++++--------- platform/android/export/export_plugin.cpp | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'platform/android') diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index 720752d28f..084761b794 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -411,9 +411,9 @@ DisplayServerAndroid::DisplayServerAndroid(const String &p_rendering_driver, Dis if (rendering_driver == "opengl") { bool gl_initialization_error = false; - if (RasterizerGLES2::is_viable() == OK) { - RasterizerGLES2::register_config(); - RasterizerGLES2::make_current(); + if (RasterizerOpenGLis_viable() == OK) { + RasterizerOpenGLregister_config(); + RasterizerOpenGLmake_current(); } else { gl_initialization_error = true; } diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index e01ad004a0..1cac0ed4ce 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1599,7 +1599,7 @@ //public: // virtual void get_preset_features(const Ref &p_preset, List *r_features) override { // String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name"); -// if (driver == "GLES2") { +// if (driver == "OpenGL") { // r_features->push_back("etc"); // } // // FIXME: Review what texture formats are used for Vulkan. @@ -1769,10 +1769,10 @@ // String tmp_export_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmpexport.apk"); -//#define CLEANUP_AND_RETURN(m_err) \ -// { \ -// DirAccess::remove_file_or_error(tmp_export_path); \ -// return m_err; \ +//#define CLEANUP_AND_RETURN(m_err) +// { +// DirAccess::remove_file_or_error(tmp_export_path); +// return m_err; // } // // Export to temporary APK before sending to device. @@ -2565,10 +2565,10 @@ // String tmp_unaligned_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmpexport-unaligned.apk"); -//#define CLEANUP_AND_RETURN(m_err) \ -// { \ -// DirAccess::remove_file_or_error(tmp_unaligned_path); \ -// return m_err; \ +//#define CLEANUP_AND_RETURN(m_err) +// { +// DirAccess::remove_file_or_error(tmp_unaligned_path); +// return m_err; // } // zipFile unaligned_apk = zipOpen2(tmp_unaligned_path.utf8().get_data(), APPEND_STATUS_CREATE, nullptr, &io2); diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index aa1aa4d264..50823884cd 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -1612,7 +1612,7 @@ Vector EditorExportPlatformAndroid::get_enabled_abis(const Ref &p_preset, List *r_features) { String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name"); - if (driver == "GLES2") { + if (driver == "OpenGL") { r_features->push_back("etc"); } // FIXME: Review what texture formats are used for Vulkan. -- cgit v1.2.3