nvk: fix barrier cache invalidation

Fixes: e1c1cdbd5f ("nvk: Implement vkCmdPipelineBarrier2 for real")
Reviewed-by: Mary Guillemard <mary@mary.zone>
Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
(cherry picked from commit fe558d8328)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40752>
This commit is contained in:
emre 2026-03-26 01:23:36 +03:00 committed by Eric Engestrom
parent dbdbef673f
commit b5c8c1dcb2
2 changed files with 2 additions and 2 deletions

View file

@ -1834,7 +1834,7 @@
"description": "nvk: fix barrier cache invalidation",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "e1c1cdbd5f382bca34c6d8e5728a90274b893dc0",
"notes": null

View file

@ -714,7 +714,7 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
dev->vk.enabled_features.pipelineFragmentShadingRate)
P_IMMD(p, NVC597, INVALIDATE_RASTER_CACHE_NO_WFI, 0);
if (barriers & (NVK_BARRIER_INVALIDATE_SHADER_DATA &
if (barriers & (NVK_BARRIER_INVALIDATE_SHADER_DATA |
NVK_BARRIER_INVALIDATE_CONSTANT)) {
if (nvk_cmd_buffer_last_subchannel(cmd) == SUBC_NVA097) {
P_IMMD(p, NVA097, INVALIDATE_SHADER_CACHES_NO_WFI, {