noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Rename GLES2 driver to OpenGL to prepare for the upgrade to GLES3

Browse Source 
- Use lowercase driver names for the `--rendering-driver`
  command line argument.
This commit is contained in:
Hugo Locurcio
2021-09-27 01:07:10 +02:00
parent e3491a3744
commit ce97ddbcb1
98 changed files with 4344 additions and 12432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/display_server_android.cpp
View File

@@ -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;
}

18
platform/android/export/export.cpp
View File

@@ -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);

2
platform/android/export/export_plugin.cpp
View File

@@ -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.