diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-28 10:17:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 10:17:38 +0200 |
| commit | e66013a6f1704c299591ceb279f2d03fa974996b (patch) | |
| tree | 0700d0cf515f81a698ddd953293b30d7efcff719 /platform | |
| parent | 1a8dfcd97b6d95d67aa00221196cdcc26b585e97 (diff) | |
| parent | 313006adb81a859662cf25e86c6e1b3b98c5f6f0 (diff) | |
Merge pull request #42262 from akien-mga/ios-pvrtc-fixes
iOS: Fix multiple issues with PVRTC import, disable ETC1
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/iphone/export/export.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 97f954ebb2..19f7c8e482 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -160,9 +160,8 @@ public: void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { String driver = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name"); - if (driver == "GLES2") { - r_features->push_back("etc"); - } else if (driver == "Vulkan") { + r_features->push_back("pvrtc"); + if (driver == "Vulkan") { // FIXME: Review if this is correct. r_features->push_back("etc2"); } @@ -1649,7 +1648,7 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset } } - String etc_error = test_etc2(); + String etc_error = test_etc2_or_pvrtc(); if (etc_error != String()) { valid = false; err += etc_error; |