diff options
author | Ian Romanick <[email protected]> | 2011-08-31 11:43:39 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2011-09-26 12:14:14 -0700 |
commit | 29386d1f2d60e905d63f4c5f045ff3794b2ff99c (patch) | |
tree | 74c63a1767356ec4f9e6a3c4694720008c87d6fa /src/mesa/main/teximage.c | |
parent | 425284e88244e63a627b3fc4ae4514f064c71a83 (diff) |
mesa: Remove EXT_bgra and EXT_texture_format_BGRA8888 extension enable flags
All drivers remaining in Mesa support this extension. This extension
is either required or optional features in desktop OpenGL, OpenGL ES
1.x, and OpenGL ES 2.x.
EXT_texture_format_BGRA8888 is mostly a subset of EXT_bgra. The only
difference seems to be that EXT_texture_format_BGRA8888 allows GL_BGRA
as an internal format to glTexImage2D and friends.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/teximage.c')
-rw-r--r-- | src/mesa/main/teximage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 65fe23cac0d..daa71fd7b1a 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -149,9 +149,11 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) ; /* fallthrough */ } - if (ctx->Extensions.EXT_texture_format_BGRA8888) { + /* GL_BGRA can be an internal format *only* in OpenGL ES (1.x or 2.0). + */ + if (ctx->API != API_OPENGL) { switch (internalFormat) { - case GL_BGRA_EXT: + case GL_BGRA: return GL_RGBA; default: ; /* fallthrough */ |