From: Erik Faye-Lund Date: Mon, 25 Feb 2019 11:06:23 +0000 (+0100) Subject: mesa/main: make the PRIMITIVE_RESTART_NV checks consistent X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00c683bc8e991031b88cfe0862415e571daf851b;p=mesa.git mesa/main: make the PRIMITIVE_RESTART_NV checks consistent {En,Dis}ableClientState(PRIMITIVE_RESTART_NV) should only work on compatibility contextxs. While we're at it, modernize the code a bit, by using the extension helpers instead of open-coding. Signed-off-by: Erik Faye-Lund Reviewed-by: Ian Romanick --- diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index dc9c77cfb86..ce64e037906 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -107,7 +107,7 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state) /* GL_NV_primitive_restart */ case GL_PRIMITIVE_RESTART_NV: - if (!ctx->Extensions.NV_primitive_restart) + if (!_mesa_has_NV_primitive_restart(ctx)) goto invalid_enum_error; if (ctx->Array.PrimitiveRestart == state) return; @@ -1721,9 +1721,8 @@ _mesa_IsEnabled( GLenum cap ) /* GL_NV_primitive_restart */ case GL_PRIMITIVE_RESTART_NV: - if (ctx->API != API_OPENGL_COMPAT || !ctx->Extensions.NV_primitive_restart) { + if (!_mesa_has_NV_primitive_restart(ctx)) goto invalid_enum_error; - } return ctx->Array.PrimitiveRestart; /* GL 3.1 primitive restart */