From bf91d6ae4ae0c50aa77246a8d065d4e490615ef1 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 25 Feb 2019 13:28:39 +0100 Subject: [PATCH] mesa/main: make the CONSERVATIVE_RASTERIZATION_NV checks consistent This just makes the logic of the checks for this enum the same for gl{Enable,Disable} and for glIsEnabled. They are already functionally the same, so this is just a minor code-cleanup. Signed-off-by: Erik Faye-Lund Reviewed-by: Ian Romanick --- 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 ce64e037906..9a59b775da4 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1774,7 +1774,8 @@ _mesa_IsEnabled( GLenum cap ) return ctx->IntelConservativeRasterization; case GL_CONSERVATIVE_RASTERIZATION_NV: - CHECK_EXTENSION(NV_conservative_raster); + if (!_mesa_has_NV_conservative_raster(ctx)) + goto invalid_enum_error; return ctx->ConservativeRasterization; case GL_TILE_RASTER_ORDER_FIXED_MESA: -- 2.30.2