projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca385bf
)
mesa: Return after ScissorArrayv or ScissorIndexed detect a parameter error
author
Courtney Goeltzenleuchter
<courtney@lunarg.com>
Thu, 23 Jan 2014 20:53:42 +0000
(13:53 -0700)
committer
Ian Romanick
<ian.d.romanick@intel.com>
Wed, 29 Jan 2014 16:40:02 +0000
(09:40 -0700)
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>
src/mesa/main/scissor.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/scissor.c
b/src/mesa/main/scissor.c
index 14c8e8a6cad9ffd4525dde0325a8a626f42f75fe..83f39e2a0f92d790ae9248f4b601eb432bfd5025 100644
(file)
--- 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);