From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 18 Jul 2017 13:13:44 +0000 (+0200)
Subject: mesa: add KHR_no_error support to glMultiDrawElementsBaseVertex()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb6b2997203906c90faf8b471dec7bf2bc24ec1d;p=mesa.git

mesa: add KHR_no_error support to glMultiDrawElementsBaseVertex()

Just skip validation when no_error is enabled.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 4f86d196dbc..dfb8402014a 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -1408,9 +1408,16 @@ vbo_exec_MultiDrawElementsBaseVertex(GLenum mode,
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if (!_mesa_validate_MultiDrawElements(ctx, mode, count, type, indices,
-                                         primcount))
-      return;
+   if (_mesa_is_no_error_enabled(ctx)) {
+      FLUSH_CURRENT(ctx, 0);
+
+      if (ctx->NewState)
+         _mesa_update_state(ctx);
+   } else {
+      if (!_mesa_validate_MultiDrawElements(ctx, mode, count, type, indices,
+                                            primcount))
+         return;
+   }
 
    if (skip_validated_draw(ctx))
       return;