diff options
| author | Ian Romanick <[email protected]> | 2013-11-20 13:41:23 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-12-04 17:22:42 -0800 |
| commit | 538a7f2a8082e748caa599636c01833332bd039a (patch) | |
| tree | 6d5bd1877429ad89589f147d69d55c9325c851b7 /src/mesa/main/attrib.c | |
| parent | e0587fb9d06e868e0c6efe5d44c2204448d3bb12 (diff) | |
mesa: Use a single enable for GL_EXT_texture_array and GL_MESA_texture_array
Every driver that enables one also enables the other. The difference
between the two is MESA adds support for fixed-function and assembly
fragment shaders, but EXT only adds support for GLSL. The MESA
extension was created back when Mesa did not support GLSL.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index c9332bd522d..718eb834feb 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -641,7 +641,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, !!(enabled & TEXTURE_CUBE_BIT)); } - if (ctx->Extensions.MESA_texture_array) { + if (ctx->Extensions.EXT_texture_array) { _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT, !!(enabled & TEXTURE_1D_ARRAY_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT, @@ -688,7 +688,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) _mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE_NV, !!(unit->Enabled & TEXTURE_RECT_BIT)); } - if (ctx->Extensions.MESA_texture_array) { + if (ctx->Extensions.EXT_texture_array) { _mesa_set_enable(ctx, GL_TEXTURE_1D_ARRAY_EXT, !!(unit->Enabled & TEXTURE_1D_ARRAY_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT, @@ -768,7 +768,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) } else if ((obj->Target == GL_TEXTURE_1D_ARRAY_EXT || obj->Target == GL_TEXTURE_2D_ARRAY_EXT) && - !ctx->Extensions.MESA_texture_array) { + !ctx->Extensions.EXT_texture_array) { continue; } else if (obj->Target == GL_TEXTURE_CUBE_MAP_ARRAY && |