From 820dec3f7c76edf0fe4ceae5a1d1c55bb0ddba6b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Mon, 25 Jan 2021 13:08:20 -0500
Subject: [PATCH] mesa: don't skip draws with count == 0 or numInstances == 0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

These are checked by drivers (all gallium drivers and
_mesa_draw_gallium_fallback), so they are redundant here.

Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8798>
---
 src/mesa/main/draw_validate.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/mesa/main/draw_validate.c b/src/mesa/main/draw_validate.c
index 8995e6c..b66654d 100644
--- a/src/mesa/main/draw_validate.c
+++ b/src/mesa/main/draw_validate.c
@@ -798,9 +798,6 @@ validate_draw_arrays(struct gl_context *ctx, const char *func,
       xfb_obj->GlesRemainingPrims -= prim_count;
    }
 
-   if (count == 0)
-      return false;
-
    return true;
 }
 
@@ -826,10 +823,9 @@ _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint fi
       return GL_FALSE;
    }
 
-   if (numInstances <= 0) {
-      if (numInstances < 0)
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glDrawArraysInstanced(numInstances=%d)", numInstances);
+   if (numInstances < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glDrawArraysInstanced(numInstances=%d)", numInstances);
       return GL_FALSE;
    }
 
@@ -898,8 +894,7 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
    }
 
    return validate_DrawElements_common(ctx, mode, count, type, indices,
-                                       "glDrawElementsInstanced")
-      && (numInstances > 0);
+                                       "glDrawElementsInstanced");
 }
 
 
@@ -939,11 +934,10 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx,
       return GL_FALSE;
    }
 
-   if (numInstances <= 0) {
-      if (numInstances < 0)
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glDrawTransformFeedback*Instanced(numInstances=%d)",
-                     numInstances);
+   if (numInstances < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glDrawTransformFeedback*Instanced(numInstances=%d)",
+                  numInstances);
       return GL_FALSE;
    }
 
-- 
2.7.4