Mesa (master): mesa: Don' t call _mesa_ClipControl from glPopAttrib when unsupported.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Nov 4 06:37:48 UTC 2014
Module: Mesa
Branch: master
Commit: 8ca8dd123af78e9d4ff08f8fac2346e17fb7a0ee
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ca8dd123af78e9d4ff08f8fac2346e17fb7a0ee
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Nov 3 18:16:41 2014 -0800
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 at whitecape.org>
---
src/mesa/main/attrib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 5345339..4684615 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:
More information about the mesa-commit
mailing list