diff options
| author | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2011-09-19 15:03:03 +0800 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-09-19 08:11:52 -0600 |
| commit | 7a9a8bbabd27b8475b541cbdb2b43f75e23dbf4c (patch) | |
| tree | 208c26e7886ad06293c750970d9914dab5bb7340 /src/mesa/main/pixel.c | |
| parent | 6a9880224368a016dfb1a9f5b5dfa9284a7dc6cf (diff) | |
| download | external_mesa3d-7a9a8bbabd27b8475b541cbdb2b43f75e23dbf4c.zip external_mesa3d-7a9a8bbabd27b8475b541cbdb2b43f75e23dbf4c.tar.gz external_mesa3d-7a9a8bbabd27b8475b541cbdb2b43f75e23dbf4c.tar.bz2 | |
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 <yuanhan.liu@linux.intel.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/pixel.c')
| -rw-r--r-- | src/mesa/main/pixel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 7757462..c87f5e0 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; |