diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-12-13 15:59:38 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-03-04 12:57:43 -0800 |
| commit | 89c6473ff0890b84f1400b9cd6f31146b75a7f4c (patch) | |
| tree | 2f4f00ae6c0980f69bc5f228fdee9b132019741f | |
| parent | a4a8af4cbbe726ac00147e30310c1f84c92533bb (diff) | |
meta: Fallback to software for GetTexImage of compressed GL_TEXTURE_CUBE_MAP_ARRAY
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>
(cherry picked from commit 070f55d8935af6fee62506b54bc86c1bf5049a82)
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 77b0e8a14b2..87913a0db7f 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -4165,7 +4165,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; |