From: Erik Faye-Lund Date: Mon, 25 Feb 2019 12:27:07 +0000 (+0100) Subject: mesa/main: correct extension-checks for GL_BLEND_ADVANCED_COHERENT_KHR X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34ade0dc7c1d8cc974435432d1ce4bdb034443c8;p=mesa.git mesa/main: correct extension-checks for GL_BLEND_ADVANCED_COHERENT_KHR KHR_blend_equation_advanced_coherent isn't exposed on OpenGL ES 1.x, so we shouldn't allow its enums there either. 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 bbe66304eb9..42b862b6258 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1149,7 +1149,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) break; case GL_BLEND_ADVANCED_COHERENT_KHR: - CHECK_EXTENSION(KHR_blend_equation_advanced_coherent); + if (!_mesa_has_KHR_blend_equation_advanced_coherent(ctx)) + goto invalid_enum_error; if (ctx->Color.BlendCoherent == state) return; FLUSH_VERTICES(ctx, ctx->DriverFlags.NewBlend ? 0 : _NEW_COLOR); @@ -1772,7 +1773,8 @@ _mesa_IsEnabled( GLenum cap ) return ctx->Multisample.SampleShading; case GL_BLEND_ADVANCED_COHERENT_KHR: - CHECK_EXTENSION(KHR_blend_equation_advanced_coherent); + if (!_mesa_has_KHR_blend_equation_advanced_coherent(ctx)) + goto invalid_enum_error; return ctx->Color.BlendCoherent; case GL_CONSERVATIVE_RASTERIZATION_INTEL: