From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 25 Feb 2019 11:44:55 +0000 (+0100)
Subject: mesa/main: clean up extension-check for GL_VERTEX_PROGRAM_TWO_SIDE
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5e781aa8085ef5f6fcfbf3dc09fc8899e64e13d;p=mesa.git

mesa/main: clean up extension-check for GL_VERTEX_PROGRAM_TWO_SIDE

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

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 */