From: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat, 25 Oct 2014 00:59:05 +0000 (-0700)
Subject: meta: Only use _mesa_ClipControl if the extension is supported
X-Git-Tag: upstream/17.1.0~22711
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e462d9221191dc64444862614c1616a33691f67;p=platform%2Fupstream%2Fmesa.git

meta: Only use _mesa_ClipControl if the extension is supported

Fixes many piglit failures on IVB since 85edaa8.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85425
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Cc: Mathias Fröhlich <Mathias.Froehlich@gmx.net>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 45c50fd..87532c1 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -681,9 +681,11 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
                      0.0, ctx->DrawBuffer->Height,
                      -1.0, 1.0);
 
-      save->ClipOrigin = ctx->Transform.ClipOrigin;
-      save->ClipDepthMode = ctx->Transform.ClipDepthMode;
-      _mesa_ClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE);
+      if (ctx->Extensions.ARB_clip_control) {
+         save->ClipOrigin = ctx->Transform.ClipOrigin;
+         save->ClipDepthMode = ctx->Transform.ClipDepthMode;
+         _mesa_ClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE);
+      }
    }
 
    if (state & MESA_META_CLIP) {
@@ -1086,7 +1088,8 @@ _mesa_meta_end(struct gl_context *ctx)
 
       _mesa_MatrixMode(save->MatrixMode);
 
-      _mesa_ClipControl(save->ClipOrigin, save->ClipDepthMode);
+      if (ctx->Extensions.ARB_clip_control)
+         _mesa_ClipControl(save->ClipOrigin, save->ClipDepthMode);
    }
 
    if (state & MESA_META_CLIP) {