aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/enable.c
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2019-02-25 13:28:39 +0100
committerErik Faye-Lund <[email protected]>2019-05-29 10:54:09 +0200
commitbf91d6ae4ae0c50aa77246a8d065d4e490615ef1 (patch)
treeecbe8cd88e228e39e85220b3a803ce58cbc72c43 /src/mesa/main/enable.c
parent00c683bc8e991031b88cfe0862415e571daf851b (diff)
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 <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main/enable.c')
-rw-r--r--src/mesa/main/enable.c3
1 files changed, 2 insertions, 1 deletions
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: