diff options
| author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-09-27 01:07:10 +0200 |
|---|---|---|
| committer | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-10-30 02:05:49 +0200 |
| commit | ce97ddbcb125228cc88fbfdcae932e110ee7daee (patch) | |
| tree | f3e2f17be75973806d6f468826e0232cf35b247a /platform/android | |
| parent | e3491a37445014cc3527d6f2c1467063222b2dd8 (diff) | |
Rename GLES2 driver to OpenGL to prepare for the upgrade to GLES3
- Use lowercase driver names for the `--rendering-driver`
command line argument.
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/display_server_android.cpp | 6 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 18 | ||||
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 2 |
3 files changed, 13 insertions, 13 deletions
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<EditorExportPreset> &p_preset, List<String> *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<String> EditorExportPlatformAndroid::get_enabled_abis(const Ref<EditorExp void EditorExportPlatformAndroid::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *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. |