From 12e228fc9c7aa06809797d4b706ee05a2eb7c735 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 25 Feb 2019 12:25:04 +0100 Subject: [PATCH] mesa/main: clean up extension-check for GL_VERTEX_PROGRAM Signed-off-by: Erik Faye-Lund Part-of: --- src/mesa/main/enable.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index e4b6b76cbda..2fddd1cb4fa 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1027,9 +1027,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) break; case GL_VERTEX_PROGRAM_ARB: - if (ctx->API != API_OPENGL_COMPAT) + if (!_mesa_has_ARB_vertex_program(ctx)) goto invalid_enum_error; - CHECK_EXTENSION(ARB_vertex_program); if (ctx->VertexProgram.Enabled == state) return; FLUSH_VERTICES(ctx, _NEW_PROGRAM); @@ -1811,9 +1810,8 @@ _mesa_IsEnabled( GLenum cap ) return ctx->Point.PointSprite; case GL_VERTEX_PROGRAM_ARB: - if (ctx->API != API_OPENGL_COMPAT) + if (!_mesa_has_ARB_vertex_program(ctx)) goto invalid_enum_error; - CHECK_EXTENSION(ARB_vertex_program); return ctx->VertexProgram.Enabled; case GL_VERTEX_PROGRAM_POINT_SIZE_ARB: /* This was added with ARB_vertex_program, but it is also used with -- 2.30.2