diff options
| author | Yuanhan Liu <yuanhan.liu@linux.intel.com> | 2011-09-19 15:03:03 +0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-10-24 15:54:30 -0700 |
| commit | 8fb8b8528de66e547833d0f357cc6d1e0912e1bc (patch) | |
| tree | 0e3ef8f40f6d756991da36315504ead965fba09d | |
| parent | 0ebdfa31bc2156c251c2ebc6ddf1964ac1f58765 (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 <yuanhan.liu@linux.intel.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 7a9a8bbabd27b8475b541cbdb2b43f75e23dbf4c)
| -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 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; |