From e9b162820954a96688bc734ff0614bd0320e88cb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 7 Feb 2023 12:48:33 -0500 Subject: [PATCH] zink: set gfx feedback loop bit in pipeline state for driver workaround this needs to be set on context create or it may never get set Fixes: 645f2da3faf ("zink: always set VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT sometimes") Reviewed-by: Emma Anholt Part-of: (cherry picked from commit 0cb326cc74464f4e7f57de5c4d740e080f5e5b70) --- .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 1eec8ce..c1a833d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -481,7 +481,7 @@ "description": "zink: set gfx feedback loop bit in pipeline state for driver workaround", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "645f2da3faf3852e0a263c386a97a7cd7f617694" }, diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index ba11566..7621dbc 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -4860,6 +4860,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; const uint32_t data[] = {0}; if (!is_copy_only) { -- 2.7.4