From 4947436da735e7b8f3bf1a0e1b0e6376e3ab22d7 Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Mon, 17 Feb 2025 17:11:23 -0500
Subject: [PATCH] vk/runtime: Use vk_command_buffer in renderpass wrappers

The comment is out of date, and all drivers using the runtime use
vk_command_buffer. Let's use it directly.

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34159>
---
 src/vulkan/runtime/vk_render_pass.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/vulkan/runtime/vk_render_pass.c b/src/vulkan/runtime/vk_render_pass.c
index 121f9b1f85c..40c618ea7ed 100644
--- a/src/vulkan/runtime/vk_render_pass.c
+++ b/src/vulkan/runtime/vk_render_pass.c
@@ -248,43 +248,34 @@ vk_common_CmdBeginRenderPass(VkCommandBuffer commandBuffer,
                              const VkRenderPassBeginInfo* pRenderPassBegin,
                              VkSubpassContents contents)
 {
-   /* We don't have a vk_command_buffer object but we can assume, since we're
-    * using common dispatch, that it's a vk_object of some sort.
-    */
-   struct vk_object_base *disp = (struct vk_object_base *)commandBuffer;
+   VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer);
 
    VkSubpassBeginInfo info = {
       .sType = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO,
       .contents = contents,
    };
 
-   disp->device->dispatch_table.CmdBeginRenderPass2(commandBuffer,
-                                                    pRenderPassBegin, &info);
+   cmd_buffer->base.device->dispatch_table.CmdBeginRenderPass2(
+      commandBuffer, pRenderPassBegin, &info);
 }
 
 VKAPI_ATTR void VKAPI_CALL
 vk_common_CmdEndRenderPass(VkCommandBuffer commandBuffer)
 {
-   /* We don't have a vk_command_buffer object but we can assume, since we're
-    * using common dispatch, that it's a vk_object of some sort.
-    */
-   struct vk_object_base *disp = (struct vk_object_base *)commandBuffer;
+   VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer);
 
    VkSubpassEndInfo info = {
       .sType = VK_STRUCTURE_TYPE_SUBPASS_END_INFO,
    };
 
-   disp->device->dispatch_table.CmdEndRenderPass2(commandBuffer, &info);
+   cmd_buffer->base.device->dispatch_table.CmdEndRenderPass2(commandBuffer, &info);
 }
 
 VKAPI_ATTR void VKAPI_CALL
 vk_common_CmdNextSubpass(VkCommandBuffer commandBuffer,
                          VkSubpassContents contents)
 {
-   /* We don't have a vk_command_buffer object but we can assume, since we're
-    * using common dispatch, that it's a vk_object of some sort.
-    */
-   struct vk_object_base *disp = (struct vk_object_base *)commandBuffer;
+   VK_FROM_HANDLE(vk_command_buffer, cmd_buffer, commandBuffer);
 
    VkSubpassBeginInfo begin_info = {
       .sType = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO,
@@ -295,8 +286,8 @@ vk_common_CmdNextSubpass(VkCommandBuffer commandBuffer,
       .sType = VK_STRUCTURE_TYPE_SUBPASS_END_INFO,
    };
 
-   disp->device->dispatch_table.CmdNextSubpass2(commandBuffer, &begin_info,
-                                                &end_info);
+   cmd_buffer->base.device->dispatch_table.CmdNextSubpass2(
+      commandBuffer, &begin_info, &end_info);
 }
 
 static unsigned