OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/main: make the PRIMITIVE_RESTART_NV checks consistent

Browse Source 
{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 <erik.faye-lund@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Erik Faye-Lund
2019-02-25 12:06:23 +01:00
parent d3771ccaa3
commit 00c683bc8e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/main/enable.c
View File

@@ -107,7 +107,7 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
/* GL_NV_primitive_restart */ /* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV: case GL_PRIMITIVE_RESTART_NV:
if (!ctx->Extensions.NV_primitive_restart) if (!_mesa_has_NV_primitive_restart(ctx))
goto invalid_enum_error; goto invalid_enum_error;
if (ctx->Array.PrimitiveRestart == state) if (ctx->Array.PrimitiveRestart == state)
return; return;
@@ -1721,9 +1721,8 @@ _mesa_IsEnabled( GLenum cap )
/* GL_NV_primitive_restart */ /* GL_NV_primitive_restart */
case GL_PRIMITIVE_RESTART_NV: 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; goto invalid_enum_error;
}
return ctx->Array.PrimitiveRestart; return ctx->Array.PrimitiveRestart;
/* GL 3.1 primitive restart */ /* GL 3.1 primitive restart */