From 72bf7ad7012cf88807b09b7e32cab2f9ada2b43d Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 6 Mar 2026 11:41:01 -0500
Subject: [PATCH] vk/cmd_queue: generate CmdPushConstants2

Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40268>
---
 src/vulkan/runtime/vk_cmd_enqueue.c | 26 --------------------------
 src/vulkan/util/vk_cmd_queue_gen.py |  3 ---
 2 files changed, 29 deletions(-)

diff --git a/src/vulkan/runtime/vk_cmd_enqueue.c b/src/vulkan/runtime/vk_cmd_enqueue.c
index 32e2daed6ad..bd933512ddd 100644
--- a/src/vulkan/runtime/vk_cmd_enqueue.c
+++ b/src/vulkan/runtime/vk_cmd_enqueue.c
@@ -247,29 +247,3 @@ vk_cmd_enqueue_CmdBuildAccelerationStructuresKHR(
 err:
    vk_command_buffer_set_error(cmd_buffer, VK_ERROR_OUT_OF_HOST_MEMORY);
 }
-
-VKAPI_ATTR void VKAPI_CALL vk_cmd_enqueue_CmdPushConstants2(
-   VkCommandBuffer                             commandBuffer,
-   const VkPushConstantsInfoKHR* pPushConstantsInfo)
-{
-   VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer);
-   struct vk_cmd_queue *queue = &cmd_buffer->cmd_queue;
-
-   struct vk_cmd_queue_entry *cmd =
-      linear_zalloc_child(queue->ctx, vk_cmd_queue_type_sizes[VK_CMD_PUSH_CONSTANTS2]);
-   if (!cmd)
-      return;
-
-   cmd->type = VK_CMD_PUSH_CONSTANTS2;
-
-   VkPushConstantsInfoKHR *info = linear_alloc_child(queue->ctx, sizeof(*info));
-   void *pValues = linear_alloc_child(queue->ctx, pPushConstantsInfo->size);
-
-   memcpy(info, pPushConstantsInfo, sizeof(*info));
-   memcpy(pValues, pPushConstantsInfo->pValues, pPushConstantsInfo->size);
-
-   cmd->u.push_constants2.push_constants_info = info;
-   info->pValues = pValues;
-
-   list_addtail(&cmd->cmd_link, &cmd_buffer->cmd_queue.cmds);
-}
diff --git a/src/vulkan/util/vk_cmd_queue_gen.py b/src/vulkan/util/vk_cmd_queue_gen.py
index 01c4558ace0..eaf32432347 100644
--- a/src/vulkan/util/vk_cmd_queue_gen.py
+++ b/src/vulkan/util/vk_cmd_queue_gen.py
@@ -46,9 +46,6 @@ MANUAL_COMMANDS = [
     # Incomplete struct copies which lead to an use after free.
     'CmdBuildAccelerationStructuresKHR',
 
-    # pData's size cannot be calculated from the xml
-    'CmdPushConstants2',
-
     # VkDispatchGraphCountInfoAMDX::infos is an array of
     # VkDispatchGraphInfoAMDX, but the xml specifies that it is a
     # VkDeviceOrHostAddressConstAMDX.