summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@qt.io>2019-10-24 17:43:34 +0300
committerJanne Koskinen <janne.p.koskinen@qt.io>2019-10-25 12:22:54 +0300
commit25236c672d81a73ee8754dbd764eb8a2a26d866e (patch)
tree203aae7940841c7104f92f3ea4b48027df41b3ac
parent872703128020a960fa00e4e35b8c16bb2ba53930 (diff)
Add legacy compile option for astc file typesv2.5.02.5
When enabled astc file is not loaded until needed for texture creation. Change-Id: I94d49087eaa1ba288372d7668c68ab1876255e01 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/runtime/Qt3DSApplication.cpp6
1 files 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