aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2019-02-25 12:25:04 +0100
committerErik Faye-Lund <[email protected]>2020-04-01 12:57:57 +0200
commit12e228fc9c7aa06809797d4b706ee05a2eb7c735 (patch)
treed4543c7f1c5af61545277994cffcd1e25f9e8d73
parent23570066bfdeebb54953f2c3ac6c7dc73e368f38 (diff)
mesa/main: clean up extension-check for GL_VERTEX_PROGRAM
Signed-off-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>
-rw-r--r--src/mesa/main/enable.c6
1 files 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