Module: Mesa Branch: staging/22.3 Commit: 71edfbd539aaca1b768d142f16e1b408b18b1e7a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=71edfbd539aaca1b768d142f16e1b408b18b1e7a
Author: noasakurajin <[email protected]> Date: Tue Nov 8 09:16:22 2022 +0000 disable zinks shader cache when the needed functions do not exist Fixes: 4e14da056d6 ("zink: Enable mesa/st frontend shader caching.") Reviewed-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19592> (cherry picked from commit 7666988937ee9057b575e61437480e23a254c62a) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 9c7ee0fa927..f21e44a4cb6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -355,7 +355,7 @@ "description": "disable zinks shader cache when the needed functions do not exist", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "4e14da056d623ababf7cf82cf2fca51c18b462f1" }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 0edfbf7501b..9e54a2ed4e4 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -228,12 +228,14 @@ disk_cache_init(struct zink_screen *screen) struct mesa_sha1 ctx; _mesa_sha1_init(&ctx); +#ifdef HAVE_DL_ITERATE_PHDR /* Hash in the zink driver build. */ const struct build_id_note *note = build_id_find_nhdr_for_addr(disk_cache_init); unsigned build_id_len = build_id_length(note); assert(note && build_id_len == 20); /* sha1 */ _mesa_sha1_update(&ctx, build_id_data(note), build_id_len); +#endif /* Hash in the Vulkan pipeline cache UUID to identify the combination of * vulkan device and driver (or any inserted layer that would invalidate our
