diff --git a/lib/glloader.c b/lib/glloader.c index 11c8104756..bac141324a 100644 --- a/lib/glloader.c +++ b/lib/glloader.c @@ -985,7 +985,9 @@ ktxTexture2_GLUpload(ktxTexture2* This, GLuint* pTexture, GLenum* pTarget, return KTX_INVALID_OPERATION; } } else { - // TODO Check DFD for ASTC HDR or 3D or RGB[DEM] and figure out format. + // TODO: Check DFD for ASTC HDR or 3D or RGB[DEM] and figure out format. + return KTX_INVALID_OPERATION; // BasisU textures must be transcoded + // before upload. } formatInfo.glFormat = glGetFormatFromInternalFormat(formatInfo.glInternalformat); diff --git a/tools/ktx2check/ktx2check.cpp b/tools/ktx2check/ktx2check.cpp index 5ea8ce5a69..6802b5f6c5 100644 --- a/tools/ktx2check/ktx2check.cpp +++ b/tools/ktx2check/ktx2check.cpp @@ -1439,7 +1439,10 @@ ktxValidator::validateDfd(validationContext& ctx) if (result & i_FLOAT_FORMAT_BIT) findStr += "FLOAT"; - if (result & i_NORMALIZED_FORMAT_BIT) + // else here because Vulkan format names do not reflect + // both normalized and float. E.g, BC6H is just + // VK_FORMAT_BC6H_[SU]FLOAT_BLOCK. + else if (result & i_NORMALIZED_FORMAT_BIT) findStr += "NORM"; else findStr += "INT";