From 06872e284da1c00ce03b234ca24aefeac64990d2 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 24 Jan 2013 08:36:10 +0100 Subject: fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013 fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee --- mesalib/src/mesa/main/glformats.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'mesalib/src/mesa/main/glformats.c') diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c index e4f784179..6160d8ecd 100644 --- a/mesalib/src/mesa/main/glformats.c +++ b/mesalib/src/mesa/main/glformats.c @@ -867,18 +867,17 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format) switch (format) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: - return ctx->Extensions.EXT_texture_compression_s3tc; case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - return (_mesa_is_desktop_gl(ctx) && - ctx->Extensions.EXT_texture_compression_s3tc) || - (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt); + /* Assume that the ANGLE flag will always be set if the EXT flag is set. + */ + return ctx->Extensions.ANGLE_texture_compression_dxt; case GL_RGB_S3TC: case GL_RGB4_S3TC: case GL_RGBA_S3TC: case GL_RGBA4_S3TC: - return _mesa_is_desktop_gl(ctx) && ctx->Extensions.S3_s3tc; + return _mesa_is_desktop_gl(ctx) && + ctx->Extensions.ANGLE_texture_compression_dxt; case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: -- cgit v1.2.3