summaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2023-06-10 01:04:18 +0200
committerGitHub <noreply@github.com>2023-06-10 01:04:18 +0200
commit9723077f4f91598152013b02b6c7d0576c74b319 (patch)
tree90c5e8b55e71cc83a68697e8435c6b0630de2409 /platform
parent504acb9a15edac60b3c5c6d7a13726c8c4e936b5 (diff)
parent944fbce347db29f24af07a709aa238986ade509a (diff)
downloadredot-engine-9723077f4f91598152013b02b6c7d0576c74b319.tar.gz
Merge pull request #77105 from aaronfranke/s3tc_bptc_and_etc2_astc
Enable S3TC_BPTC but not ETC2_ASTC by default
Diffstat (limited to 'platform')
-rw-r--r--platform/macos/os_macos.h1
-rw-r--r--platform/macos/os_macos.mm6
2 files changed, 7 insertions, 0 deletions
diff --git a/platform/macos/os_macos.h b/platform/macos/os_macos.h
index 69aab800f3..ab61649d19 100644
--- a/platform/macos/os_macos.h
+++ b/platform/macos/os_macos.h
@@ -121,6 +121,7 @@ public:
virtual Error move_to_trash(const String &p_path) override;
virtual String get_system_ca_certificates() override;
+ virtual OS::PreferredTextureFormat get_preferred_texture_format() const override;
void run();
diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm
index 5c6cef65c0..fe6d8d9fb0 100644
--- a/platform/macos/os_macos.mm
+++ b/platform/macos/os_macos.mm
@@ -700,6 +700,12 @@ String OS_MacOS::get_system_ca_certificates() {
return certs;
}
+OS::PreferredTextureFormat OS_MacOS::get_preferred_texture_format() const {
+ // macOS supports both formats on ARM. Prefer S3TC/BPTC
+ // for better compatibility with x86 platforms.
+ return PREFERRED_TEXTURE_FORMAT_S3TC_BPTC;
+}
+
void OS_MacOS::run() {
if (!main_loop) {
return;