Mesa (staging/21.0): zink: flag gfx pipeline dirty using newer mechanism

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 80302b96f446252424320b9c34c48687b17d5af9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80302b96f446252424320b9c34c48687b17d5af9

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jan 25 09:40:50 2021 -0500

zink: flag gfx pipeline dirty using newer mechanism

this wasn't updated during rebases

Fixes: 334759d8509 ("zink: implement passthrough tcs shader injection")

Reviewed-by: Hoe Hao Cheng <haochengho12907 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8696>
(cherry picked from commit c3719f3b9ba06fa557d7e8ed6b94ad5db3d7baca)

---

 .pick_status.json                    | 2 +-
 src/gallium/drivers/zink/zink_draw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index cfa948022f8..6461e0fd1b3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -472,7 +472,7 @@
         "description": "zink: flag gfx pipeline dirty using newer mechanism",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "334759d8509b1ca3009edd0ad9b7caad3e12456e"
     },
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index d5e949bfae2..ed2068368ff 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -256,7 +256,7 @@ zink_draw_vbo(struct pipe_context *pctx,
       return;
    }
    if (ctx->gfx_pipeline_state.vertices_per_patch != dinfo->vertices_per_patch)
-      ctx->gfx_pipeline_state.hash = 0;
+      ctx->gfx_pipeline_state.dirty = true;
    ctx->gfx_pipeline_state.vertices_per_patch = dinfo->vertices_per_patch;
    struct zink_gfx_program *gfx_program = get_gfx_program(ctx);
    if (!gfx_program)