Module: Mesa Branch: staging/22.3 Commit: 265bee703d935a64497a0bc1bad0e77dea672f97 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=265bee703d935a64497a0bc1bad0e77dea672f97
Author: Mike Blumenkrantz <[email protected]> Date: Wed Jan 4 10:15:17 2023 -0500 zink: stop using VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT this used to be fine back when there was only one thread doing cache management, but now the cache is used by precompile threads too, so let the driver do sync fixes #7660 Fixes: 41ffb15de56 ("zink: implement async gfx precompile") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20519> (cherry picked from commit f18827e0153c555d2f3897b57f8ea0349b5bb41f) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 668560020fd..e4a3503b3f2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -265,7 +265,7 @@ "description": "zink: stop using VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "41ffb15de564849668c942aa79a570b6f262de99" }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index d3b9d782c9d..9235e71c0a0 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -336,8 +336,7 @@ cache_get_job(void *data, void *gdata, int thread_index) VkPipelineCacheCreateInfo pcci; pcci.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; pcci.pNext = NULL; - pcci.flags = screen->info.have_EXT_pipeline_creation_cache_control || screen->info.feats13.pipelineCreationCacheControl ? - VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT : 0; + pcci.flags = 0; pcci.initialDataSize = 0; pcci.pInitialData = NULL;
