Module: Mesa Branch: master Commit: 90e7ce5bde88d157f996bced5d6c3af2f6f6d3a3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90e7ce5bde88d157f996bced5d6c3af2f6f6d3a3
Author: Erik Faye-Lund <[email protected]> Date: Mon Feb 25 13:28:08 2019 +0100 mesa/main: make the CONSERVATIVE_RASTERIZATION_INTEL checks consistent INTEL_conservative_rasterization isn't exposed on compatibility contexts, nor for GLES 3.0 and below. We already do this correctly for gl{Enable,Disable}, but we should do the same for glIsEnabled as well. Signed-off-by: Erik Faye-Lund <[email protected]> Reviewed-by: Ian Romanick <[email protected]> --- 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 f92498b3dc6..dc9c77cfb86 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1770,7 +1770,8 @@ _mesa_IsEnabled( GLenum cap ) return ctx->Color.BlendCoherent; case GL_CONSERVATIVE_RASTERIZATION_INTEL: - CHECK_EXTENSION(INTEL_conservative_rasterization); + if (!_mesa_has_INTEL_conservative_rasterization(ctx)) + goto invalid_enum_error; return ctx->IntelConservativeRasterization; case GL_CONSERVATIVE_RASTERIZATION_NV: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
