From 538a7f2a8082e748caa599636c01833332bd039a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 20 Nov 2013 13:41:23 -0800 Subject: 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 Reviewed-by: Jordan Justen Reviewed-by: Brian Paul --- src/mesa/main/enable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/main/enable.c') diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index c047f5df2c5..869c8a29dee 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; } -- cgit v1.2.3