summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKimmo Ollila <kimmo.ollila@qt.io>2019-09-16 14:10:51 +0300
committerJere Tuliniemi <jere.tuliniemi@qt.io>2019-09-17 14:21:21 +0300
commitf224d704fbe1795b480ecf3eb8d54a7ffaaa6abc (patch)
treed79dac1c9920b8320dd557d117315e968a53247b
parenta9f2fee6291c1b291178f13007ed400c912ab10c (diff)
Fix ASTC loading
Task-number: QT3DS-3903 Change-Id: I0f0cb49ea4d630f2af5e384569f1dd1a1880ae71 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp b/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
index 54a8138..9f98c9d 100644
--- a/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
+++ b/src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp
@@ -267,6 +267,11 @@ SLoadedTexture *SLoadedTexture::LoadASTC(const QString &inPath, QT3DSI32 flipVer
retval->height = image->height;
retval->format = static_cast<NVRenderTextureFormats::Enum>(image->format);
+ image->mipheight[0] = image->height;
+ image->mipwidth[0] = image->width;
+ image->size[0] = ((image->width + 3) / 4) * ((image->height + 3) / 4) * 16;
+ image->data[0] = image->dataBlock;
+
return retval;
}