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

mesa/main: make the FRAGMENT_PROGRAM checks consistent

Browse source 
IsEnabled(FRAGMENT_PROGRAM) isn't supposed to be allowed, but our
check allowed this anyway. Let's make these checks consistent, and
while we're at it, modernize them a bit.

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 147751a856
commit 0dff3eecda
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

@ -974,9 +974,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
break; break;
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB:
if (ctx->API != API_OPENGL_COMPAT) if (!_mesa_has_ARB_fragment_program(ctx))
goto invalid_enum_error; goto invalid_enum_error;
CHECK_EXTENSION(ARB_fragment_program);
if (ctx->FragmentProgram.Enabled == state) if (ctx->FragmentProgram.Enabled == state)
return; return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM); FLUSH_VERTICES(ctx, _NEW_PROGRAM);
@ -1671,7 +1670,7 @@ _mesa_IsEnabled( GLenum cap )
return ctx->Stencil.TestTwoSide; return ctx->Stencil.TestTwoSide;
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB:
if (ctx->API != API_OPENGL_COMPAT) if (!_mesa_has_ARB_fragment_program(ctx))
goto invalid_enum_error; goto invalid_enum_error;
return ctx->FragmentProgram.Enabled; return ctx->FragmentProgram.Enabled;