From f663573f1903bc0d37a96a3cf90cefcb9a762f41 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 26 May 2017 11:25:15 -0700 Subject: [PATCH] Fix compressed KTX loading --- libraries/ktx/src/khronos/KHR.h | 5 +++-- libraries/ktx/src/ktx/KTX.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/ktx/src/khronos/KHR.h b/libraries/ktx/src/khronos/KHR.h index d710ca7b40..a98f2cc0d4 100644 --- a/libraries/ktx/src/khronos/KHR.h +++ b/libraries/ktx/src/khronos/KHR.h @@ -212,10 +212,11 @@ namespace khronos { template inline uint32_t evalAlignedCompressedBlockCount(uint32_t value) { // FIXME add static assert that ALIGNMENT is a power of 2 - return (value + (ALIGNMENT - 1) / ALIGNMENT); + static uint32_t ALIGNMENT_REMAINDER = ALIGNMENT - 1; + return (value + ALIGNMENT_REMAINDER) / ALIGNMENT; } - inline uint8_t evalBlockAlignemnt(InternalFormat format, uint32_t value) { + inline uint32_t evalCompressedBlockCount(InternalFormat format, uint32_t value) { switch (format) { case InternalFormat::COMPRESSED_SRGB_S3TC_DXT1_EXT: // BC1 case InternalFormat::COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: // BC1A diff --git a/libraries/ktx/src/ktx/KTX.cpp b/libraries/ktx/src/ktx/KTX.cpp index d6faee4cc7..788ec54a47 100644 --- a/libraries/ktx/src/ktx/KTX.cpp +++ b/libraries/ktx/src/ktx/KTX.cpp @@ -30,7 +30,7 @@ uint32_t Header::evalMaxDimension() const { uint32_t Header::evalPixelOrBlockDimension(uint32_t pixelDimension) const { if (isCompressed()) { - return khronos::gl::texture::evalBlockAlignemnt(getGLInternaFormat(), pixelDimension); + return khronos::gl::texture::evalCompressedBlockCount(getGLInternaFormat(), pixelDimension); } return pixelDimension; }