From 0d2ee71f64ca79f478eba96ea1dbb793d29100b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 27 Sep 2015 01:50:55 +0200 Subject: [PATCH] S3TC really is *not* supported on 3D textures. --- src/Magnum/PixelFormat.h | 16 ++++++++-------- src/Magnum/TextureFormat.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Magnum/PixelFormat.h b/src/Magnum/PixelFormat.h index ae01b043c..43a81fcf2 100644 --- a/src/Magnum/PixelFormat.h +++ b/src/Magnum/PixelFormat.h @@ -762,8 +762,8 @@ enum class CompressedPixelFormat: GLenum { #endif /** - * S3TC DXT1 compressed RGB. **Available only for 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT1 compressed RGB. **Available only for 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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} @@ -771,8 +771,8 @@ enum class CompressedPixelFormat: GLenum { RGBS3tcDxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT, /** - * S3TC DXT1 compressed RGBA. **Available only for 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT1 compressed RGBA. **Available only for 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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} @@ -780,8 +780,8 @@ enum class CompressedPixelFormat: GLenum { RGBAS3tcDxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, /** - * S3TC DXT3 compressed RGBA. **Available only for 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT3 compressed RGBA. **Available only for 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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} @@ -789,8 +789,8 @@ enum class CompressedPixelFormat: GLenum { RGBAS3tcDxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, /** - * S3TC DXT5 compressed RGBA. **Available only for 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT5 compressed RGBA. **Available only for 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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} diff --git a/src/Magnum/TextureFormat.h b/src/Magnum/TextureFormat.h index 31e4fa5ad..32de31dbc 100644 --- a/src/Magnum/TextureFormat.h +++ b/src/Magnum/TextureFormat.h @@ -1021,8 +1021,8 @@ enum class TextureFormat: GLenum { #endif /** - * S3TC DXT1 compressed RGB. **Available only on 2D, 3D, 2D array, cube map - * and cube map array textures.** + * S3TC DXT1 compressed RGB. **Available only on 2D, 2D array, cube map and + * cube map array textures.** * @requires_extension Extension @extension{EXT,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} @@ -1030,8 +1030,8 @@ enum class TextureFormat: GLenum { CompressedRGBS3tcDxt1 = GL_COMPRESSED_RGB_S3TC_DXT1_EXT, /** - * S3TC DXT1 compressed RGBA. **Available only on 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT1 compressed RGBA. **Available only on 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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} @@ -1039,8 +1039,8 @@ enum class TextureFormat: GLenum { CompressedRGBAS3tcDxt1 = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, /** - * S3TC DXT3 compressed RGBA. **Available only on 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT3 compressed RGBA. **Available only on 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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} @@ -1048,8 +1048,8 @@ enum class TextureFormat: GLenum { CompressedRGBAS3tcDxt3 = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, /** - * S3TC DXT5 compressed RGBA. **Available only on 2D, 3D, 2D array, cube - * map and cube map array textures.** + * S3TC DXT5 compressed RGBA. **Available only on 2D, 2D array, cube map + * and cube map array textures.** * @requires_extension Extension @extension{EXT,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}