fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/main: correct extension-checks for GL_PRIMITIVE_RESTART_FIXED_INDEX

Browse source 
This shouldn't be allowed in GLES 1/2.

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 13:34:41 +01:00
parent 34ade0dc7c
commit b9e9d701dc
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1108,7 +1108,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
break; break;
case GL_PRIMITIVE_RESTART_FIXED_INDEX: case GL_PRIMITIVE_RESTART_FIXED_INDEX:
if (!_mesa_is_gles3(ctx) && !ctx->Extensions.ARB_ES3_compatibility) if (!_mesa_is_gles3(ctx) && !_mesa_has_ARB_ES3_compatibility(ctx))
goto invalid_enum_error; goto invalid_enum_error;
if (ctx->Array.PrimitiveRestartFixedIndex != state) { if (ctx->Array.PrimitiveRestartFixedIndex != state) {
FLUSH_VERTICES(ctx, 0); FLUSH_VERTICES(ctx, 0);
@ -1739,9 +1739,8 @@ _mesa_IsEnabled( GLenum cap )
return ctx->Array.PrimitiveRestart; return ctx->Array.PrimitiveRestart;
case GL_PRIMITIVE_RESTART_FIXED_INDEX: case GL_PRIMITIVE_RESTART_FIXED_INDEX:
if (!_mesa_is_gles3(ctx) && !ctx->Extensions.ARB_ES3_compatibility) { if (!_mesa_is_gles3(ctx) && !_mesa_has_ARB_ES3_compatibility(ctx))
goto invalid_enum_error; goto invalid_enum_error;
}
return ctx->Array.PrimitiveRestartFixedIndex; return ctx->Array.PrimitiveRestartFixedIndex;
/* GL3.0 - GL_framebuffer_sRGB */ /* GL3.0 - GL_framebuffer_sRGB */