summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-19 10:21:09 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commitd21ae02fb227ed80f27417ac3fc0b83e491e8c01 (patch)
treeab1a58face4ba25c2308dfc9e96ffcfbd83ff354 /src/mesa/vbo
parente98cb5bbca393be9dc15bed49bdb0a2408d462cf (diff)
mesa: add KHR_no_error support to glMultiDrawArrays()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
-rw-r--r--src/mesa/vbo/vbo_exec_array.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 98abf47bd3a..809deb71303 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -733,8 +733,15 @@ vbo_exec_MultiDrawArrays(GLenum mode, const GLint *first,
"glMultiDrawArrays(%s, %p, %p, %d)\n",
_mesa_enum_to_string(mode), first, count, primcount);
- if (!_mesa_validate_MultiDrawArrays(ctx, mode, count, primcount))
- return;
+ if (_mesa_is_no_error_enabled(ctx)) {
+ FLUSH_CURRENT(ctx, 0);
+
+ if (ctx->NewState)
+ _mesa_update_state(ctx);
+ } else {
+ if (!_mesa_validate_MultiDrawArrays(ctx, mode, count, primcount))
+ return;
+ }
for (i = 0; i < primcount; i++) {
if (count[i] > 0) {