From 0064841f28f7d66646a3a5fdcdba74d9a47d29bd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 7 Feb 2023 12:50:10 -0500 Subject: [PATCH] zink: set zs feedback loop bit from driver workaround on ctx create this may otherwise not be set until the cache has been broken Fixes: 56fb2580642 ("zink: replace mixed_zs with zs feedback loops") Reviewed-by: Emma Anholt Part-of: (cherry picked from commit bbae237258a40c370caffb58602745f1d36f66ba) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_context.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c1a833d..91f0619 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -472,7 +472,7 @@ "description": "zink: set zs feedback loop bit from driver workaround on ctx create", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "56fb25806428506469982e35ee5076b981023c92" }, diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 7621dbc..7c8cec2 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -4861,6 +4861,7 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) ctx->gfx_pipeline_state.rendering_info.sType = VK_STRUCTURE_TYPE_PIPELINE_RENDERING_CREATE_INFO; ctx->gfx_pipeline_state.rendering_info.pColorAttachmentFormats = ctx->gfx_pipeline_state.rendering_formats; ctx->gfx_pipeline_state.feedback_loop = screen->driver_workarounds.always_feedback_loop; + ctx->gfx_pipeline_state.feedback_loop_zs = screen->driver_workarounds.always_feedback_loop_zs; const uint32_t data[] = {0}; if (!is_copy_only) { -- 2.7.4