summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/genmipmap.c
diff options
context:
space:
mode:
authorNanley Chery <nanley.g.chery@intel.com>2015-05-18 16:30:30 -0700
committerNanley Chery <nanley.g.chery@intel.com>2015-08-26 14:36:42 -0700
commit582ce1ea976a16aa8f32ff72cb2fecb00186e253 (patch)
tree5158e4db6c87aea54999d5a56281cc80a86d20e6 /src/mesa/main/genmipmap.c
parente9fd8e154fdb0394cbaed5e14ac52e689a020ebe (diff)
downloadexternal_mesa3d-582ce1ea976a16aa8f32ff72cb2fecb00186e253.zip
external_mesa3d-582ce1ea976a16aa8f32ff72cb2fecb00186e253.tar.gz
external_mesa3d-582ce1ea976a16aa8f32ff72cb2fecb00186e253.tar.bz2
mesa: don't enable online compression for ASTC formats
In agreement with the ASTC spec, this makes calls to TexImage*D unsuccessful. Implied by the spec, Generate[Texture]Mipmap and [Copy]Tex[Sub]Image*D calls must be unsuccessful as well. v2. actually force attempts to compress online to fail. v3. indentation (Matt). v4. update copytexture_error_check to account for CopyTexImage*D (Chad). Reviewed-by: Chad Versace <chad.versace@intel.com> Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Diffstat (limited to 'src/mesa/main/genmipmap.c')
-rw-r--r--src/mesa/main/genmipmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/genmipmap.c b/src/mesa/main/genmipmap.c
index c18f9d5..4ec8385 100644
--- a/src/mesa/main/genmipmap.c
+++ b/src/mesa/main/genmipmap.c
@@ -111,6 +111,7 @@ _mesa_generate_texture_mipmap(struct gl_context *ctx,
if (_mesa_is_enum_format_integer(srcImage->InternalFormat) ||
_mesa_is_depthstencil_format(srcImage->InternalFormat) ||
+ _mesa_is_astc_format(srcImage->InternalFormat) ||
_mesa_is_stencil_format(srcImage->InternalFormat)) {
_mesa_unlock_texture(ctx, texObj);
_mesa_error(ctx, GL_INVALID_OPERATION,