The hardware decompression path isn't even close to being able to handle this. This converts the crash (assertion failure) in "EXT_texture_compression_s3tc/getteximage-targets S3TC CUBE_ARRAY" to a plain old failure. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Cc: "9.1 9.2 10.0" <mesa-stable@lists.freedesktop.org>tags/mesa-10.1-rc1
@@ -4219,7 +4219,8 @@ _mesa_meta_GetTexImage(struct gl_context *ctx, | |||
* unsigned, normalized values. We could handle signed and unnormalized | |||
* with floating point renderbuffers... | |||
*/ | |||
if (_mesa_is_format_compressed(texImage->TexFormat) && | |||
if (texImage->TexObject->Target != GL_TEXTURE_CUBE_MAP_ARRAY | |||
&& _mesa_is_format_compressed(texImage->TexFormat) && | |||
_mesa_get_format_datatype(texImage->TexFormat) | |||
== GL_UNSIGNED_NORMALIZED) { | |||
struct gl_texture_object *texObj = texImage->TexObject; |