From: Nanley Chery <nanley.g.ch...@intel.com>
In agreement with the extension spec and commit
dd0eb004874645135b9aaac3ebbd0aaf274079ea, filter FXT1 formats to the
desktop GL profiles. Now we no longer advertise such formats as supported
in an ES context and then throw an INVALID_ENUM error when the client
tries to use such formats with CompressedTexImage2D.
Fixes the following 26 dEQP tests:
* dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border_cube_neg_x
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border_cube_neg_y
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border_cube_neg_z
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border_cube_pos_x
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border_cube_pos_y
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_border_cube_pos_z
* dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_invalid_size
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_level_max_cube_pos
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_level_max_tex2d
* dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_level_cube
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_level_tex2d
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_cube_neg_x
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_cube_neg_y
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_cube_neg_z
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_cube_pos_x
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_cube_pos_y
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_cube_pos_z
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_neg_width_height_tex2d
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_cube_neg_x
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_cube_neg_y
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_cube_neg_z
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_cube_pos_x
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_cube_pos_y
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_cube_pos_z
*
dEQP-GLES2.functional.negative_api.texture.compressedteximage2d_width_height_max_tex2d
Cc: Ian Romanick <ian.d.roman...@intel.com>
Cc: Mark Janes <mark.a.ja...@intel.com>
Cc: "11.0" <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Nanley Chery <nanley.g.ch...@intel.com>
---
src/mesa/main/texcompress.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index feaf061..1615f4f 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -286,7 +286,9 @@ GLuint
_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
{
GLuint n = 0;
- if (ctx->Extensions.TDFX_texture_compression_FXT1) {
+ if (ctx->Extensions.TDFX_texture_compression_FXT1 &&
+ (ctx->API == API_OPENGL_CORE ||
+ (ctx->API == API_OPENGL_COMPAT && ctx->Version > 10))) {
if (formats) {
formats[n++] = GL_COMPRESSED_RGB_FXT1_3DFX;
formats[n++] = GL_COMPRESSED_RGBA_FXT1_3DFX;
--
2.6.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
