mesa/teximage: Fix S3TC regression due to ASTC interaction
authorNanley Chery <nanley.g.chery@intel.com>
Wed, 28 Oct 2015 21:50:58 +0000 (14:50 -0700)
committerNanley Chery <nanley.g.chery@intel.com>
Sun, 22 Nov 2015 20:29:09 +0000 (12:29 -0800)
commitd1212abf505a468c9947a66dbf2d59acb4616e42
tree67fb58bff2f27267a3ffbdc40b5d6b8028d3c374
parent21d43fe51ab5bcbc89ad5c61a51d3517c4243298
mesa/teximage: Fix S3TC regression due to ASTC interaction

A prior, literal reading of the ASTC spec led to the prohibition
of some compressed formats being used against the targets:
TEXTURE_CUBE_MAP_ARRAY and TEXTURE_3D. Since the spec does not specify
interactions with other extensions for specific compressed textures,
remove such interactions.

Fixes the following Piglit tests on Gen9:
piglit.spec.arb_direct_state_access.getcompressedtextureimage
piglit.spec.arb_get_texture_sub_image.arb_get_texture_sub_image-getcompressed
piglit.spec.arb_texture_cube_map_array.fbo-generatemipmap-cubemap array s3tc_dxt1
piglit.spec.ext_texture_compression_s3tc.getteximage-targets cube_array s3tc

v2. Don't interact with other specific compressed formats (Ian).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91927
Suggested-by: Neil Roberts <neil@linux.intel.com>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
src/mesa/main/teximage.c