From c24aa449d0ff784adaea6310657f4eef72ac3594 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 19 May 2022 11:10:23 -0500 Subject: [PATCH] vulkan,anv,turnip: Add a common CmdBindVertexBuffers wrapper Part-of: --- src/freedreno/vulkan/tu_cmd_buffer.c | 11 ----------- src/intel/vulkan/anv_cmd_buffer.c | 12 ------------ src/vulkan/runtime/vk_command_buffer.c | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 8c06f051506..3a291d00d78 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1759,17 +1759,6 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer, return VK_SUCCESS; } -VKAPI_ATTR void VKAPI_CALL -tu_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, - uint32_t firstBinding, - uint32_t bindingCount, - const VkBuffer *pBuffers, - const VkDeviceSize *pOffsets) -{ - tu_CmdBindVertexBuffers2EXT(commandBuffer, firstBinding, bindingCount, - pBuffers, pOffsets, NULL, NULL); -} - VKAPI_ATTR void VKAPI_CALL tu_CmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index e549cdcc4cb..80efd6af21b 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -1197,18 +1197,6 @@ void anv_CmdBindVertexBuffers2( } } -void anv_CmdBindVertexBuffers( - VkCommandBuffer commandBuffer, - uint32_t firstBinding, - uint32_t bindingCount, - const VkBuffer* pBuffers, - const VkDeviceSize* pOffsets) -{ - return anv_CmdBindVertexBuffers2(commandBuffer, firstBinding, - bindingCount, pBuffers, pOffsets, - NULL, NULL); -} - void anv_CmdBindTransformFeedbackBuffersEXT( VkCommandBuffer commandBuffer, uint32_t firstBinding, diff --git a/src/vulkan/runtime/vk_command_buffer.c b/src/vulkan/runtime/vk_command_buffer.c index 5675b73440b..477562ee8fb 100644 --- a/src/vulkan/runtime/vk_command_buffer.c +++ b/src/vulkan/runtime/vk_command_buffer.c @@ -81,3 +81,18 @@ vk_common_CmdExecuteCommands(VkCommandBuffer commandBuffer, vk_cmd_queue_execute(&secondary->cmd_queue, commandBuffer, disp); } } + +VKAPI_ATTR void VKAPI_CALL +vk_common_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, + uint32_t firstBinding, + uint32_t bindingCount, + const VkBuffer *pBuffers, + const VkDeviceSize *pOffsets) +{ + VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer); + const struct vk_device_dispatch_table *disp = + &cmd_buffer->base.device->dispatch_table; + + disp->CmdBindVertexBuffers2(commandBuffer, firstBinding, bindingCount, + pBuffers, pOffsets, NULL, NULL); +}