Mesa (master): mesa/main: correct extension-checks for GL_BLACKHOLE_RENDER_INTEL

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 70b6972140e74037109b7f8c57d442c8316d09dc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=70b6972140e74037109b7f8c57d442c8316d09dc

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Feb 19 12:12:27 2020 +0100

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 at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/329>

---

 src/mesa/main/enable.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 573643b419b..f41f6185796 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: