From 0a7a42bdc3855b1b08e92930f182815276130f86 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 26 May 2017 12:04:35 -0700
Subject: [PATCH] fix force of BC3 instead of BC1a compression
---
libraries/image/src/image/Image.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/libraries/image/src/image/Image.cpp b/libraries/image/src/image/Image.cpp
index dcc65e8995..f274dc54f8 100644
--- a/libraries/image/src/image/Image.cpp
+++ b/libraries/image/src/image/Image.cpp
@@ -493,10 +493,6 @@ gpu::TexturePointer TextureUsage::process2DTextureColorFromImage(const QImage& s
if (validAlpha) {
processTextureAlpha(image, validAlpha, alphaAsMask);
-
- // NOTE: This disables BC1a compression because it was producing odd artifacts on text textures
- // for the tutorial. Instead we use BC3 (which is larger) but doesn't produce the same artifacts).
- alphaAsMask = false;
}
gpu::TexturePointer theTexture = nullptr;
@@ -506,7 +502,9 @@ gpu::TexturePointer TextureUsage::process2DTextureColorFromImage(const QImage& s
gpu::Element formatGPU;
if (isColorTexturesCompressionEnabled()) {
if (validAlpha) {
- formatGPU = alphaAsMask ? gpu::Element::COLOR_COMPRESSED_SRGBA_MASK : gpu::Element::COLOR_COMPRESSED_SRGBA;
+ // NOTE: This disables BC1a compression because it was producing odd artifacts on text textures
+ // for the tutorial. Instead we use BC3 (which is larger) but doesn't produce the same artifacts).
+ formatGPU = gpu::Element::COLOR_COMPRESSED_SRGBA;
} else {
formatGPU = gpu::Element::COLOR_COMPRESSED_SRGB;
}