Mesa (master): main: don' t error when enabling conservative rasterization on gles

[Lionel Landwerlin]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Dec  8 11:00:00 2016 +0000

main: don't error when enabling conservative rasterization on gles

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

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

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 669fe16..f0c5bb7 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -440,7 +440,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          ctx->Color.IndexLogicOpEnabled = state;
          break;
       case GL_CONSERVATIVE_RASTERIZATION_INTEL:
-         if (!_mesa_is_desktop_gl(ctx) && ctx->API != API_OPENGLES)
+         if (!_mesa_has_INTEL_conservative_rasterization(ctx))
             goto invalid_enum_error;
          if (ctx->IntelConservativeRasterization == state)
             return;