Mesa (staging/22.0): zink: flag sample locations for re-set on batch flush

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 3eb32e16acfad721d9f05d801606c6b95ed91895
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3eb32e16acfad721d9f05d801606c6b95ed91895

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Mar 15 18:24:28 2022 -0400

zink: flag sample locations for re-set on batch flush

this needs to be re-set any time the cmdbuf changes

cc: mesa-stable

Tested-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15397>
(cherry picked from commit efa724133f6e454b209837713ad4218ade6eb7d0)

Conflicts:
	src/gallium/drivers/zink/zink_context.c

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/zink/zink_context.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index e8b6799bb41..683b159de6b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -9220,7 +9220,7 @@
         "description": "zink: flag sample locations for re-set on batch flush",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 5,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 5856f0ff89c..936d3fb226f 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2484,6 +2484,9 @@ flush_batch(struct zink_context *ctx, bool sync)
       ctx->oom_stall = false;
       ctx->dd->bindless_bound = false;
       ctx->di.bindless_refs_dirty = true;
+      ctx->sample_locations_changed = ctx->gfx_pipeline_state.sample_locations_enabled;
+      if (conditional_render_active)
+         zink_start_conditional_render(ctx);
    }
 }