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 | |
| 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]>
| -rw-r--r-- | src/mesa/main/extensions.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/glformats.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 16 |
3 files changed, 8 insertions, 20 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 375978e8270..5d01ac8ea63 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -202,8 +202,8 @@ static const struct extension extension_table[] = { { "GL_EXT_texture3D", o(EXT_texture3D), GLL, 1996 }, { "GL_EXT_texture_array", o(EXT_texture_array), GL, 2006 }, { "GL_EXT_texture_compression_dxt1", o(ANGLE_texture_compression_dxt), GL | ES1 | ES2, 2004 }, - { "GL_ANGLE_texture_compression_dxt3", o(ANGLE_texture_compression_dxt), ES2, 2011 }, - { "GL_ANGLE_texture_compression_dxt5", o(ANGLE_texture_compression_dxt), ES2, 2011 }, + { "GL_ANGLE_texture_compression_dxt3", o(ANGLE_texture_compression_dxt), GL | ES1 | ES2, 2011 }, + { "GL_ANGLE_texture_compression_dxt5", o(ANGLE_texture_compression_dxt), GL | ES1 | ES2, 2011 }, { "GL_EXT_texture_compression_latc", o(EXT_texture_compression_latc), GL, 2006 }, { "GL_EXT_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 }, { "GL_EXT_texture_compression_s3tc", o(EXT_texture_compression_s3tc), GL, 2000 }, 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: diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index fdeecf3cfd4..31a559e9dc0 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -190,7 +190,9 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - if (ctx->Extensions.EXT_texture_compression_s3tc) { + /* Assume that the ANGLE flag will always be set if the EXT flag is set. + */ + if (ctx->Extensions.ANGLE_texture_compression_dxt) { switch (internalFormat) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: return GL_RGB; @@ -203,18 +205,6 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) } } - /* GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE && GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE */ - if (ctx->API == API_OPENGLES2 && - ctx->Extensions.ANGLE_texture_compression_dxt) { - switch (internalFormat) { - case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: - case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - return GL_RGBA; - default: - ; /* fallthrough */ - } - } - if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.ANGLE_texture_compression_dxt) { switch (internalFormat) { |