Browse Source

Minor color/texture format fixes.

Just fooling around. Also, I hate random four-letter abbreviations.
pull/59/head
Vladimír Vondruš 12 years ago
parent
commit
c621886f72
  1. 4
      src/Magnum/AbstractTexture.cpp
  2. 4
      src/Magnum/ColorFormat.h
  3. 10
      src/Magnum/TextureFormat.h

4
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:

4
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

10
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.

Loading…
Cancel
Save