summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@lunarg.com>2014-01-23 13:53:42 -0700
committerIan Romanick <ian.d.romanick@intel.com>2014-01-29 09:40:02 -0700
commit3e894e213b4a1e187c0d0fca8c6d3456a119a485 (patch)
treecdec4b86dd82bdcc2695ffea8d4ba5ab23161273
parentca385bffa6b4f9d18879240e739413d45a068c3b (diff)
mesa: Return after ScissorArrayv or ScissorIndexed detect a parameter error
Fixes piglit arb_viewport_array-scissor-ignore. Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Jon Ashburn <jon@lunarg.com>
-rw-r--r--src/mesa/main/scissor.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c
index 14c8e8a6ca..83f39e2a0f 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);