Looks good to me and fixes failing piglit test
(arb_viewport_array-scissor-ignore).
Reviewed-by: Jon Ashburn <j...@lunarg.com>
On 01/23/2014 01:53 PM, Courtney Goeltzenleuchter wrote:
Fix ScissorArrayv and ScissorIndexed to return after detecting
parameter error.
Signed-off-by: Courtney Goeltzenleuchter <court...@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);
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
