From 3e894e213b4a1e187c0d0fca8c6d3456a119a485 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 23 Jan 2014 13:53:42 -0700 Subject: [PATCH] mesa: Return after ScissorArrayv or ScissorIndexed detect a parameter error Fixes piglit arb_viewport_array-scissor-ignore. Signed-off-by: Courtney Goeltzenleuchter Reviewed-by: Ian Romanick Reviewed-by: Jon Ashburn --- 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 14c8e8a6cad..83f39e2a0f9 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); -- 2.30.2