diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-16 09:34:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-16 09:34:35 -0600 |
| commit | 3e48dd04456aaf2d42dfa7f3a3c99a95a5986eb6 (patch) | |
| tree | 1674b8d4870372b2636c365842ee3615a860d869 /src/mesa/main | |
| parent | ed7f4b42307bff4633689d6781cd3643f10041e5 (diff) | |
mesa: fix incorrect viewport clamping in _mesa_set_viewport()
A 0 by 0 viewport size is legal. Don't clamp against lower bound of one.
The error checking earlier in the function prevents negative values.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/viewport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c index ead856d32c..50e0402d27 100644 --- a/src/mesa/main/viewport.c +++ b/src/mesa/main/viewport.c @@ -73,8 +73,8 @@ _mesa_set_viewport(GLcontext *ctx, GLint x, GLint y, } /* clamp width and height to the implementation dependent range */ - width = CLAMP(width, 1, (GLsizei) ctx->Const.MaxViewportWidth); - height = CLAMP(height, 1, (GLsizei) ctx->Const.MaxViewportHeight); + width = MIN2(width, (GLsizei) ctx->Const.MaxViewportWidth); + height = MIN2(height, (GLsizei) ctx->Const.MaxViewportHeight); ctx->Viewport.X = x; ctx->Viewport.Width = width; |