From 25236c672d81a73ee8754dbd764eb8a2a26d866e Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Thu, 24 Oct 2019 17:43:34 +0300 Subject: Add legacy compile option for astc file types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When enabled astc file is not loaded until needed for texture creation. Change-Id: I94d49087eaa1ba288372d7668c68ab1876255e01 Reviewed-by: Tomi Korpipää --- src/runtime/Qt3DSApplication.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/runtime/Qt3DSApplication.cpp b/src/runtime/Qt3DSApplication.cpp index e8ed57e..13fe7a9 100644 --- a/src/runtime/Qt3DSApplication.cpp +++ b/src/runtime/Qt3DSApplication.cpp @@ -114,8 +114,10 @@ bool qt3ds::runtime::isImagePath(const QString &path) const QString ext = path.right(path.length() - index - 1); return (ext == QLatin1String("jpg") || ext == QLatin1String("jpeg") || ext == QLatin1String("png") || ext == QLatin1String("hdr") - || ext == QLatin1String("dds") || ext == QLatin1String("ktx") - || ext == QLatin1String("astc")); +#ifndef LEGACY_ASTC_LOADING + || ext == QLatin1String("astc") +#endif + || ext == QLatin1String("dds") || ext == QLatin1String("ktx")); } struct SFrameTimer -- cgit v1.2.3