diff options
| author | Ian Romanick <[email protected]> | 2013-08-19 13:16:54 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-08-21 07:46:51 -0700 |
| commit | 40550c8cedbcca508fb05baa7b7d480e6a60c51f (patch) | |
| tree | 03874b03437b63c20a6bb262aac7c08acd3238bd /src/mesa/main | |
| parent | cabd45773b58d6aa48202da1cdd8cf1a6b856c53 (diff) | |
mesa: Only advertise GL_ETC1_RGB8_OES in ES contexts
There is no extension for this format in desktop GL, so an application
can't give the format back to glCompressedTexImage2D.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
Cc: "9.2" <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/texcompress.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 58859440c24..334ea4068d9 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -277,7 +277,15 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats) } } - if (ctx->Extensions.OES_compressed_ETC1_RGB8_texture) { + /* The GL_OES_compressed_ETC1_RGB8_texture spec says: + * + * "New State + * + * The queries for NUM_COMPRESSED_TEXTURE_FORMATS and + * COMPRESSED_TEXTURE_FORMATS include ETC1_RGB8_OES." + */ + if (_mesa_is_gles(ctx) + && ctx->Extensions.OES_compressed_ETC1_RGB8_texture) { if (formats) { formats[n++] = GL_ETC1_RGB8_OES; } |