Mesa (master): mesa/main: clean up extension-check for GL_VERTEX_PROGRAM_TWO_SIDE

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a5e781aa8085ef5f6fcfbf3dc09fc8899e64e13d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5e781aa8085ef5f6fcfbf3dc09fc8899e64e13d

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Feb 25 12:44:55 2019 +0100

mesa/main: clean up extension-check for GL_VERTEX_PROGRAM_TWO_SIDE

Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>

---

 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 2fddd1cb4fa..ad743ba7b98 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1048,9 +1048,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          ctx->VertexProgram.PointSizeEnabled = state;
          break;
       case GL_VERTEX_PROGRAM_TWO_SIDE_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.TwoSideEnabled == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_PROGRAM);
@@ -1822,9 +1821,8 @@ _mesa_IsEnabled( GLenum cap )
          CHECK_EXTENSION(ARB_vertex_program);
          return ctx->VertexProgram.PointSizeEnabled;
       case GL_VERTEX_PROGRAM_TWO_SIDE_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.TwoSideEnabled;
 
       /* GL_NV_texture_rectangle */