diff options
| author | Ian Romanick <[email protected]> | 2012-12-01 12:10:08 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-01-23 23:38:04 -0500 |
| commit | 53f8251107d8a23892f0248db5a12098dadea38f (patch) | |
| tree | 723f835a57dac898691a19592e342c9bce483e9d /src/mesa/main/glformats.c | |
| parent | d45c6c817df5c00ec12d46bd07fc7735e2c2cd5a (diff) | |
mesa: Like EXT_texture_compression_dxt1, advertise ANGLE_texture_compression_dxt in all APIs
This is technically outside the ANGLE spec, but it seems unlikely to
cause any harm.
v2: Simplify the extension checks by assuming the ANGLE extension will
always be enabled by any driver that enables the EXT. Suggested by
Eric Anholt.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Acked-by: Lee Salzman <[email protected]>
Diffstat (limited to 'src/mesa/main/glformats.c')
| -rw-r--r-- | src/mesa/main/glformats.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index fc8bc2e3c3c..6160d8ecdd9 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -867,13 +867,11 @@ _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: |