summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2019-02-25 13:28:08 +0100
committerErik Faye-Lund <[email protected]>2019-05-23 11:43:18 +0200
commit90e7ce5bde88d157f996bced5d6c3af2f6f6d3a3 (patch)
treebd50b93f4b5474ccb74d8f1efea3cbae5846eb61 /src/mesa
parent0dff3eecdaa383f8d8bef7607b6007fd82e003d2 (diff)
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]>
Diffstat (limited to 'src/mesa')
-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 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: