diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-11-20 13:41:23 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-12-04 17:22:42 -0800 |
| commit | 538a7f2a8082e748caa599636c01833332bd039a (patch) | |
| tree | 6d5bd1877429ad89589f147d69d55c9325c851b7 /src/mesa/main/enable.c | |
| parent | e0587fb9d06e868e0c6efe5d44c2204448d3bb12 (diff) | |
| download | external_mesa3d-538a7f2a8082e748caa599636c01833332bd039a.zip external_mesa3d-538a7f2a8082e748caa599636c01833332bd039a.tar.gz external_mesa3d-538a7f2a8082e748caa599636c01833332bd039a.tar.bz2 | |
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 <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/enable.c')
| -rw-r--r-- | src/mesa/main/enable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index c047f5d..869c8a2 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -938,7 +938,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) case GL_TEXTURE_1D_ARRAY_EXT: if (ctx->API != API_OPENGL_COMPAT) goto invalid_enum_error; - CHECK_EXTENSION(MESA_texture_array, cap); + CHECK_EXTENSION(EXT_texture_array, cap); if (!enable_texture(ctx, state, TEXTURE_1D_ARRAY_BIT)) { return; } @@ -947,7 +947,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) case GL_TEXTURE_2D_ARRAY_EXT: if (ctx->API != API_OPENGL_COMPAT) goto invalid_enum_error; - CHECK_EXTENSION(MESA_texture_array, cap); + CHECK_EXTENSION(EXT_texture_array, cap); if (!enable_texture(ctx, state, TEXTURE_2D_ARRAY_BIT)) { return; } |