From 2ba2c4b68a0b9f730a1d62ca9da98f02bdebd39b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 8 Aug 2018 14:06:34 -0700 Subject: [PATCH] Fix TextureCache not compressing textures on Android --- .../src/model-networking/TextureCache.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index 7f435838b6..b9def7f5b7 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -281,10 +281,12 @@ gpu::TexturePointer TextureCache::getImageTexture(const QString& path, image::Te auto loader = image::TextureUsage::getTextureLoaderForType(type, options); #ifdef USE_GLES gpu::BackendTarget target = gpu::BackendTarget::GLES32; + bool shouldCompress = true; #else gpu::BackendTarget target = gpu::BackendTarget::GL45; + bool shouldCompress = false; #endif - return gpu::TexturePointer(loader(std::move(image), path.toStdString(), false, target, false)); + return gpu::TexturePointer(loader(std::move(image), path.toStdString(), shouldCompress, target, false)); } QSharedPointer TextureCache::createResource(const QUrl& url, const QSharedPointer& fallback, @@ -1168,14 +1170,11 @@ void ImageReader::read() { #ifdef USE_GLES constexpr bool shouldCompress = true; + gpu::BackendTarget target = gpu::BackendTarget::GLES32; #else constexpr bool shouldCompress = false; -#endif - #ifdef USE_GLES - gpu::BackendTarget target = gpu::BackendTarget::GLES32; - #else gpu::BackendTarget target = gpu::BackendTarget::GL45; - #endif +#endif texture = image::processImage(std::move(buffer), _url.toString().toStdString(), _maxNumPixels, networkTexture->getTextureType(), shouldCompress, target); if (!texture) {