aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorYuanhan Liu <[email protected]>2011-09-19 15:03:03 +0800
committerBrian Paul <[email protected]>2011-09-19 08:11:52 -0600
commit7a9a8bbabd27b8475b541cbdb2b43f75e23dbf4c (patch)
tree208c26e7886ad06293c750970d9914dab5bb7340 /src/mesa
parent6a9880224368a016dfb1a9f5b5dfa9284a7dc6cf (diff)
mesa: fix error handling for glPixelZoom
According the man page, GL_INVALID_OPERATION should generated if glPixelZoom is executed between the execution of glBegin and the corresponding execution of glEnd. Signed-off-by: Yuanhan Liu <[email protected]> Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/pixel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 775746270d1..c87f5e0e9f7 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -52,6 +52,8 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
{
GET_CURRENT_CONTEXT(ctx);
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
if (ctx->Pixel.ZoomX == xfactor &&
ctx->Pixel.ZoomY == yfactor)
return;