ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

S3TC really is *not* supported on 3D textures.

pull/110/head
Vladimír Vondruš 11 years ago
parent
8ebbd5be45
commit
0d2ee71f64
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/Magnum/PixelFormat.h
  2. 16
      src/Magnum/TextureFormat.h

16
src/Magnum/PixelFormat.h
Unescape View File

@ -762,8 +762,8 @@ enum class CompressedPixelFormat: GLenum {
#endif #endif
/** /**
* S3TC DXT1 compressed RGB. **Available only for 2D, 3D, 2D array, cube * S3TC DXT1 compressed RGB. **Available only for 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}
@ -771,8 +771,8 @@ enum class CompressedPixelFormat: GLenum {
RGBS3tcDxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT, RGBS3tcDxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
/** /**
* S3TC DXT1 compressed RGBA. **Available only for 2D, 3D, 2D array, cube * S3TC DXT1 compressed RGBA. **Available only for 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}
@ -780,8 +780,8 @@ enum class CompressedPixelFormat: GLenum {
RGBAS3tcDxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, RGBAS3tcDxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
/** /**
* S3TC DXT3 compressed RGBA. **Available only for 2D, 3D, 2D array, cube * S3TC DXT3 compressed RGBA. **Available only for 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}
@ -789,8 +789,8 @@ enum class CompressedPixelFormat: GLenum {
RGBAS3tcDxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, RGBAS3tcDxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
/** /**
* S3TC DXT5 compressed RGBA. **Available only for 2D, 3D, 2D array, cube * S3TC DXT5 compressed RGBA. **Available only for 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}

16
src/Magnum/TextureFormat.h
Unescape View File

@ -1021,8 +1021,8 @@ enum class TextureFormat: GLenum {
#endif #endif
/** /**
* S3TC DXT1 compressed RGB. **Available only on 2D, 3D, 2D array, cube map * S3TC DXT1 compressed RGB. **Available only on 2D, 2D array, cube map and
* and cube map array textures.** * cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}
@ -1030,8 +1030,8 @@ enum class TextureFormat: GLenum {
CompressedRGBS3tcDxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT, CompressedRGBS3tcDxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT,
/** /**
* S3TC DXT1 compressed RGBA. **Available only on 2D, 3D, 2D array, cube * S3TC DXT1 compressed RGBA. **Available only on 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}
@ -1039,8 +1039,8 @@ enum class TextureFormat: GLenum {
CompressedRGBAS3tcDxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, CompressedRGBAS3tcDxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,
/** /**
* S3TC DXT3 compressed RGBA. **Available only on 2D, 3D, 2D array, cube * S3TC DXT3 compressed RGBA. **Available only on 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}
@ -1048,8 +1048,8 @@ enum class TextureFormat: GLenum {
CompressedRGBAS3tcDxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, CompressedRGBAS3tcDxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,
/** /**
* S3TC DXT5 compressed RGBA. **Available only on 2D, 3D, 2D array, cube * S3TC DXT5 compressed RGBA. **Available only on 2D, 2D array, cube map
* map and cube map array textures.** * and cube map array textures.**
* @requires_extension Extension @extension{EXT,texture_compression_s3tc} * @requires_extension Extension @extension{EXT,texture_compression_s3tc}
* @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc} * @requires_es_extension Extension @es_extension2{EXT,texture_compression_s3tc,texture_compression_s3tc}
* @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc} * @requires_webgl_extension Extension @webgl_extension{WEBGL,compressed_texture_s3tc}

Write Preview
Loading…
Cancel
Save