Mesa (master): mesa: Return after ScissorArrayv or ScissorIndexed detect a parameter error
Ian Romanick
idr at kemper.freedesktop.org
Wed Jan 29 16:40:17 UTC 2014
Module: Mesa
Branch: master
Commit: 3e894e213b4a1e187c0d0fca8c6d3456a119a485
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e894e213b4a1e187c0d0fca8c6d3456a119a485
Author: Courtney Goeltzenleuchter <courtney at lunarg.com>
Date: Thu Jan 23 13:53:42 2014 -0700
mesa: Return after ScissorArrayv or ScissorIndexed detect a parameter error
Fixes piglit arb_viewport_array-scissor-ignore.
Signed-off-by: Courtney Goeltzenleuchter <courtney at LunarG.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Jon Ashburn <jon at lunarg.com>
---
src/mesa/main/scissor.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c
index 14c8e8a..83f39e2 100644
--- a/src/mesa/main/scissor.c
+++ b/src/mesa/main/scissor.c
@@ -145,6 +145,7 @@ _mesa_ScissorArrayv(GLuint first, GLsizei count, const GLint *v)
_mesa_error(ctx, GL_INVALID_VALUE,
"glScissorArrayv: index (%d) width or height < 0 (%d, %d)",
i, p[i].Width, p[i].Height);
+ return;
}
}
@@ -187,6 +188,7 @@ ScissorIndexed(GLuint index, GLint left, GLint bottom,
_mesa_error(ctx, GL_INVALID_VALUE,
"%s: index (%d) width or height < 0 (%d, %d)",
function, index, width, height);
+ return;
}
set_scissor_no_notify(ctx, index, left, bottom, width, height);
More information about the mesa-commit
mailing list