Module: Mesa Branch: staging/22.2 Commit: f3c5c6230f739e8c2f31a5a09bf5a3b1d6f22e30 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3c5c6230f739e8c2f31a5a09bf5a3b1d6f22e30
Author: sjfricke <[email protected]> Date: Mon Aug 22 20:36:53 2022 +0900 anv: fix assert to build with shader cache disabled When setting -Dshader-cache=disabled the build fails due no member named 'disk_cache' in 'struct anv_physical_device' Signed-off-by: sjfricke <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Fixes: 7f1e8230 ("anv: Switch to the new common pipeline cache") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18181> (cherry picked from commit c49e328e4f41d4a2503045a0bb8bfaf65d4cde61) --- .pick_status.json | 2 +- src/intel/vulkan/anv_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7bfbdbb3de5..fb4f19bb43e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -11956,7 +11956,7 @@ "description": "anv: fix assert to build with shader cache disabled", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7f1e82306c9b59fe534b9712d85f9324b0bfb5a4" }, diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index e667f76a334..7d93425a851 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -606,7 +606,7 @@ anv_physical_device_free_disk_cache(struct anv_physical_device *device) device->vk.disk_cache = NULL; } #else - assert(device->disk_cache == NULL); + assert(device->vk.disk_cache == NULL); #endif }
