diff options
| author | Erik Faye-Lund <[email protected]> | 2019-02-25 12:50:08 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2020-04-01 12:57:57 +0200 |
| commit | 81d901aef1582dfaf7e5f27f01fc9928975ad047 (patch) | |
| tree | 07323b7eaccfbda4bcf775383e8df43f627ab07a /src/mesa/main/enable.c | |
| parent | a5e781aa8085ef5f6fcfbf3dc09fc8899e64e13d (diff) | |
mesa/main: clean up extension-check for GL_VERTEX_PROGRAM_POINT_SIZE
Signed-off-by: Erik Faye-Lund <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>
Diffstat (limited to 'src/mesa/main/enable.c')
| -rw-r--r-- | src/mesa/main/enable.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index ad743ba7b98..b9743dd66f4 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1039,9 +1039,9 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) /* This was added with ARB_vertex_program, but it is also used with * GLSL vertex shaders on desktop. */ - if (!_mesa_is_desktop_gl(ctx)) + if (!_mesa_has_ARB_vertex_program(ctx) && + ctx->API != API_OPENGL_CORE) goto invalid_enum_error; - CHECK_EXTENSION(ARB_vertex_program); if (ctx->VertexProgram.PointSizeEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_PROGRAM); @@ -1816,9 +1816,9 @@ _mesa_IsEnabled( GLenum cap ) /* This was added with ARB_vertex_program, but it is also used with * GLSL vertex shaders on desktop. */ - if (!_mesa_is_desktop_gl(ctx)) + if (!_mesa_has_ARB_vertex_program(ctx) && + ctx->API != API_OPENGL_CORE) goto invalid_enum_error; - CHECK_EXTENSION(ARB_vertex_program); return ctx->VertexProgram.PointSizeEnabled; case GL_VERTEX_PROGRAM_TWO_SIDE_ARB: if (!_mesa_has_ARB_vertex_program(ctx)) |