From 6a6d6dd20fee85f77e2ed6ccdcfed268cbd44e3d Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Thu, 5 May 2016 16:34:02 -0700 Subject: [PATCH] Defer mipmap gen to gpu --- libraries/model/src/model/TextureMap.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libraries/model/src/model/TextureMap.cpp b/libraries/model/src/model/TextureMap.cpp index 349980b702..0fed0b0b4e 100755 --- a/libraries/model/src/model/TextureMap.cpp +++ b/libraries/model/src/model/TextureMap.cpp @@ -171,14 +171,6 @@ gpu::Texture* TextureUsage::process2DTextureColorFromImage(const QImage& srcImag if (generateMips) { theTexture->autoGenerateMips(-1); - auto levels = theTexture->maxMip(); - uvec2 size(image.width(), image.height()); - for (uint8_t i = 1; i <= levels; ++i) { - size >>= 1; - size = glm::max(size, uvec2(1)); - image = image.scaled(size.x, size.y, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - theTexture->assignStoredMip(i, formatMip, image.byteCount(), image.constBits()); - } } }