From adab2e0b7a4c4c7ad55c214f1767971def199c32 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 25 Jan 2022 15:20:50 -0500
Subject: [PATCH] zink: fix vertex buffer mask computation for null buffers

off by N

affects:
KHR-GL46.texture_cube_map_array.sampling

Fixes: 53aade0ef0d ("zink: fix enabled vertex buffer mask calculation")

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14721>
(cherry picked from commit 42ae116ac753aad5853139840f3e958b986922c1)
---
 .pick_status.json                       | 2 +-
 src/gallium/drivers/zink/zink_context.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 55a2244c097..9c0f410e2d6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3784,7 +3784,7 @@
         "description": "zink: fix vertex buffer mask computation for null buffers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "53aade0ef0def4ea7f8468cdec04acd2384e2d2c"
     },
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 8657845598f..ad6a4f8f6a6 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -950,7 +950,7 @@ zink_set_vertex_buffers(struct pipe_context *pctx,
             zink_resource_buffer_barrier(ctx, res, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
                                          VK_PIPELINE_STAGE_VERTEX_INPUT_BIT);
          } else {
-            enabled_buffers &= ~BITFIELD_BIT(i);
+            enabled_buffers &= ~BITFIELD_BIT(start_slot + i);
          }
       }
    } else {