Mesa (main): zink: reject invalid draws

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: b656ab75a684807d2718d726dd807726a36f1a0f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b656ab75a684807d2718d726dd807726a36f1a0f

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Feb  1 10:41:35 2022 -0500

zink: reject invalid draws

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14859>

---

 src/gallium/drivers/zink/zink_draw.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp
index 092490efca6..1c3c2b37330 100644
--- a/src/gallium/drivers/zink/zink_draw.cpp
+++ b/src/gallium/drivers/zink/zink_draw.cpp
@@ -487,6 +487,9 @@ zink_draw(struct pipe_context *pctx,
           struct pipe_vertex_state *vstate,
           uint32_t partial_velem_mask)
 {
+   if (!dindirect && (!draws[0].count || !dinfo->instance_count))
+      return;
+
    struct zink_context *ctx = zink_context(pctx);
    struct zink_screen *screen = zink_screen(pctx->screen);
    struct zink_rasterizer_state *rast_state = ctx->rast_state;