anv: use the right vertexOffset on CmdDrawMultiIndexed

Fixes: c70ef757e63 ("anv: Use extended parameters on Gen11+")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26327>
(cherry picked from commit 43cb4cb6dde1e8fdbe609c42b47e0f27d8411982)

diff --git a/.pick_status.json b/.pick_status.json
index e0ad2657f6e7aaa41b6736d4a13e2c74f01cdd82..dc97e394d12d6f45bde54749a486b3465f7bbfb1 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -304,7 +304,7 @@
         "description": "anv: use the right vertexOffset on CmdDrawMultiIndexed",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c70ef757e6345652d4946fcc91b4816e56d86b43",
         "notes": null

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 5090e0fe1ecb903139316bd2d4a4b84e9bcf35bb..2a1ed111f2f516a7120241d6fa52b2bfa1d66cdd 100644 (file)
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -4545,7 +4545,7 @@ void genX(CmdDrawMultiIndexedEXT)(
          prim.StartInstanceLocation    = firstInstance;
          prim.BaseVertexLocation       = pVertexOffset ? *pVertexOffset : draw->vertexOffset;
          prim.ExtendedParametersPresent = true;
-         prim.ExtendedParameter0       = draw->vertexOffset;
+         prim.ExtendedParameter0       = pVertexOffset ? *pVertexOffset : draw->vertexOffset;
          prim.ExtendedParameter1       = firstInstance;
          prim.ExtendedParameter2       = i;
       }