summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-03-15 18:24:28 -0400
committerEric Engestrom <eric@engestrom.ch>2022-03-18 20:00:46 +0000
commit4855a4d445a9d879c423f3fb439e08757bb9c668 (patch)
treed18a7be006038f0798450d992a2b12fbc24c5046
parent32807e38c3574bde659ef6ddf434e57c0d7cffe8 (diff)
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@intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15397> (cherry picked from commit efa724133f6e454b209837713ad4218ade6eb7d0)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/zink/zink_context.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 03a0930b88a..cf25f9187dc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -481,7 +481,7 @@
"description": "zink: flag sample locations for re-set on batch flush",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index e29d2c810b6..836258de0dc 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2459,6 +2459,7 @@ 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;
}
}