From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 4 Nov 2014 02:16:41 +0000 (-0800)
Subject: mesa: Don't call _mesa_ClipControl from glPopAttrib when unsupported.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ca8dd123af78e9d4ff08f8fac2346e17fb7a0ee;p=mesa.git

mesa: Don't call _mesa_ClipControl from glPopAttrib when unsupported.

Otherwise, calling glPopAttrib on drivers that don't support
ARB_clip_control gives you a GL error, which is surprising at best.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 5345339f6ad..4684615a880 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1345,7 +1345,8 @@ _mesa_PopAttrib(void)
                if (xform->DepthClamp != ctx->Transform.DepthClamp)
                   _mesa_set_enable(ctx, GL_DEPTH_CLAMP,
                                    ctx->Transform.DepthClamp);
-               _mesa_ClipControl(xform->ClipOrigin, xform->ClipDepthMode);
+               if (ctx->Extensions.ARB_clip_control)
+                  _mesa_ClipControl(xform->ClipOrigin, xform->ClipDepthMode);
             }
             break;
          case GL_TEXTURE_BIT: