From f224d704fbe1795b480ecf3eb8d54a7ffaaa6abc Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Mon, 16 Sep 2019 14:10:51 +0300 Subject: Fix ASTC loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-3903 Change-Id: I0f0cb49ea4d630f2af5e384569f1dd1a1880ae71 Reviewed-by: Antti Määttä Reviewed-by: Tomi Korpipää Reviewed-by: Miikka Heikkinen --- src/runtimerender/resourcemanager/Qt3DSRenderLoadedTexture.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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(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; } -- cgit v1.2.3