From c621886f724a27de4b734d061fbf9cfa7e03214f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 18 May 2014 18:05:04 +0200 Subject: [PATCH] Minor color/texture format fixes. Just fooling around. Also, I hate random four-letter abbreviations. --- src/Magnum/AbstractTexture.cpp | 4 ++-- src/Magnum/ColorFormat.h | 4 ++-- src/Magnum/TextureFormat.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Magnum/AbstractTexture.cpp b/src/Magnum/AbstractTexture.cpp index b28a3b928..61e3c870f 100644 --- a/src/Magnum/AbstractTexture.cpp +++ b/src/Magnum/AbstractTexture.cpp @@ -391,7 +391,7 @@ ColorFormat AbstractTexture::imageFormatForInternalFormat(const TextureFormat in #endif #ifndef MAGNUM_TARGET_GLES case TextureFormat::CompressedRed: - case TextureFormat::CompressedRedRtgc1: + case TextureFormat::CompressedRedRgtc1: case TextureFormat::CompressedSignedRedRgtc1: #endif return ColorFormat::Red; @@ -594,7 +594,7 @@ ColorType AbstractTexture::imageTypeForInternalFormat(const TextureFormat intern case TextureFormat::CompressedRG: case TextureFormat::CompressedRGB: case TextureFormat::CompressedRGBA: - case TextureFormat::CompressedRedRtgc1: + case TextureFormat::CompressedRedRgtc1: case TextureFormat::CompressedRGRgtc2: case TextureFormat::CompressedRGBABptcUnorm: case TextureFormat::CompressedSRGBAlphaBptcUnorm: diff --git a/src/Magnum/ColorFormat.h b/src/Magnum/ColorFormat.h index 5abea4daa..ecfc6ee6e 100644 --- a/src/Magnum/ColorFormat.h +++ b/src/Magnum/ColorFormat.h @@ -372,8 +372,8 @@ enum class ColorType: GLenum { #ifndef MAGNUM_TARGET_GLES /** * BGR, unsigned short, red and blue 5bit, green 6bit. - * @requires_gl Only @ref Magnum::ColorType::RGB565 "ColorType::RGB565" is - * available in OpenGL ES. + * @requires_gl Only @ref Magnum::ColorType::UnsignedShort565 "ColorType::UnsignedShort565" + * is available in OpenGL ES. */ UnsignedShort565Rev = GL_UNSIGNED_SHORT_5_6_5_REV, #endif diff --git a/src/Magnum/TextureFormat.h b/src/Magnum/TextureFormat.h index b7c144306..a4f08a97d 100644 --- a/src/Magnum/TextureFormat.h +++ b/src/Magnum/TextureFormat.h @@ -704,15 +704,15 @@ enum class TextureFormat: GLenum { CompressedRGBA = GL_COMPRESSED_RGBA, /** - * RTGC compressed red channel, normalized unsigned. **Not available on + * RGTC compressed red channel, normalized unsigned. **Not available on * multisample textures.** * @requires_gl30 %Extension @extension{EXT,texture_compression_rgtc} * @requires_gl RGTC texture compression is not available in OpenGL ES. */ - CompressedRedRtgc1 = GL_COMPRESSED_RED_RGTC1, + CompressedRedRgtc1 = GL_COMPRESSED_RED_RGTC1, /** - * RTGC compressed red and green channel, normalized unsigned. **Not + * RGTC compressed red and green channel, normalized unsigned. **Not * available on multisample textures.** * @requires_gl30 %Extension @extension{EXT,texture_compression_rgtc} * @requires_gl RGTC texture compression is not available in OpenGL ES. @@ -720,7 +720,7 @@ enum class TextureFormat: GLenum { CompressedRGRgtc2 = GL_COMPRESSED_RG_RGTC2, /** - * RTGC compressed red channel, normalized signed. **Not available on + * RGTC compressed red channel, normalized signed. **Not available on * multisample textures.** * @requires_gl30 %Extension @extension{EXT,texture_compression_rgtc} * @requires_gl RGTC texture compression is not available in OpenGL ES. @@ -728,7 +728,7 @@ enum class TextureFormat: GLenum { CompressedSignedRedRgtc1 = GL_COMPRESSED_SIGNED_RED_RGTC1, /** - * RTGC compressed red and green channel, normalized signed. **Not + * RGTC compressed red and green channel, normalized signed. **Not * available on multisample textures.** * @requires_gl30 %Extension @extension{EXT,texture_compression_rgtc} * @requires_gl RGTC texture compression is not available in OpenGL ES.