From 2e709a92788628d3acbc951e47ac5f6f2c04420e Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 2 Aug 2023 09:54:47 -0500
Subject: [PATCH] nvk: Use nvk_root_descriptor_offset for drawInfoBase

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_shader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c
index e0ae089..3c0d854 100644
--- a/src/nouveau/vulkan/nvk_shader.c
+++ b/src/nouveau/vulkan/nvk_shader.c
@@ -1,5 +1,6 @@
 #include "nvk_shader.h"
 
+#include "nvk_cmd_buffer.h"
 #include "nvk_descriptor_set_layout.h"
 #include "nvk_device.h"
 #include "nvk_physical_device.h"
@@ -1109,7 +1110,7 @@ nvk_compile_nir(struct nvk_physical_device *pdev, nir_shader *nir,
    info->optLevel = debug_get_num_option("NV50_PROG_OPTIMIZE", 3);
    info->io.auxCBSlot = 1;
    info->io.uboInfoBase = 0;
-   info->io.drawInfoBase = 0;
+   info->io.drawInfoBase = nvk_root_descriptor_offset(draw.base_vertex);
    if (nir->info.stage == MESA_SHADER_COMPUTE) {
       info->prop.cp.gridInfoBase = 0;
    } else {
-- 
2.7.4