From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Wed, 19 Feb 2020 11:12:27 +0000 (+0100)
Subject: mesa/main: correct extension-checks for GL_BLACKHOLE_RENDER_INTEL
X-Git-Tag: upstream/20.1.8~1824
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70b6972140e74037109b7f8c57d442c8316d09dc;p=platform%2Fupstream%2Fmesa.git

mesa/main: correct extension-checks for GL_BLACKHOLE_RENDER_INTEL

KHR_blend_equation_advanced_coherent isn't exposed on OpenGL ES 1.x
nor OpenGL versions prior to 30, so we shouldn't allow to query its
enum-states there either.

Fixes: 74ec39f66d5 ("mesa: add INTEL_blackhole_render")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>
---

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 573643b..f41f618 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1969,7 +1969,8 @@ _mesa_IsEnabled( GLenum cap )
          return ctx->TileRasterOrderIncreasingY;
 
       case GL_BLACKHOLE_RENDER_INTEL:
-         CHECK_EXTENSION(INTEL_blackhole_render);
+         if (!_mesa_has_INTEL_blackhole_render(ctx))
+            goto invalid_enum_error;
          return ctx->IntelBlackholeRender;
 
       default: