diff options
author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2022-03-17 13:03:07 +0100 |
---|---|---|
committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2022-04-01 08:21:59 +0200 |
commit | 8396a0d1fda706a916af048dcbcd76250d2353d4 (patch) | |
tree | 0d64ddc9a5d82f9d670511279a1b3c25c0706b44 | |
parent | be28b566b0dd1972884e741250b54f127ca3460b (diff) |
radv: remove now unused radv_cmd_buffer_{begin,end}_render_pass()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15612>
-rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 50 | ||||
-rw-r--r-- | src/amd/vulkan/radv_private.h | 4 |
2 files changed, 18 insertions, 36 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 64ad93eb350..f44508fb54f 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -5971,35 +5971,27 @@ radv_cmd_buffer_end_subpass(struct radv_cmd_buffer *cmd_buffer) radv_describe_barrier_end(cmd_buffer); } -void -radv_cmd_buffer_begin_render_pass(struct radv_cmd_buffer *cmd_buffer, - const VkRenderPassBeginInfo *pRenderPassBegin) +VKAPI_ATTR void VKAPI_CALL +radv_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, + const VkRenderPassBeginInfo *pRenderPassBeginInfo, + const VkSubpassBeginInfo *pSubpassBeginInfo) { - RADV_FROM_HANDLE(radv_render_pass, pass, pRenderPassBegin->renderPass); - RADV_FROM_HANDLE(radv_framebuffer, framebuffer, pRenderPassBegin->framebuffer); + RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); + RADV_FROM_HANDLE(radv_render_pass, pass, pRenderPassBeginInfo->renderPass); + RADV_FROM_HANDLE(radv_framebuffer, framebuffer, pRenderPassBeginInfo->framebuffer); VkResult result; cmd_buffer->state.framebuffer = framebuffer; cmd_buffer->state.pass = pass; - cmd_buffer->state.render_area = pRenderPassBegin->renderArea; + cmd_buffer->state.render_area = pRenderPassBeginInfo->renderArea; - result = radv_cmd_state_setup_attachments(cmd_buffer, pass, pRenderPassBegin); + result = radv_cmd_state_setup_attachments(cmd_buffer, pass, pRenderPassBeginInfo); if (result != VK_SUCCESS) return; - result = radv_cmd_state_setup_sample_locations(cmd_buffer, pass, pRenderPassBegin); + result = radv_cmd_state_setup_sample_locations(cmd_buffer, pass, pRenderPassBeginInfo); if (result != VK_SUCCESS) return; -} - -VKAPI_ATTR void VKAPI_CALL -radv_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo *pRenderPassBeginInfo, - const VkSubpassBeginInfo *pSubpassBeginInfo) -{ - RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - - radv_cmd_buffer_begin_render_pass(cmd_buffer, pRenderPassBeginInfo); radv_cmd_buffer_begin_subpass(cmd_buffer, 0); } @@ -7650,19 +7642,6 @@ radv_CmdSetRayTracingPipelineStackSizeKHR(VkCommandBuffer commandBuffer, uint32_ cmd_buffer->state.rt_stack_size = size; } -void -radv_cmd_buffer_end_render_pass(struct radv_cmd_buffer *cmd_buffer) -{ - vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer->state.attachments); - vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer->state.subpass_sample_locs); - - cmd_buffer->state.pass = NULL; - cmd_buffer->state.subpass = NULL; - cmd_buffer->state.attachments = NULL; - cmd_buffer->state.framebuffer = NULL; - cmd_buffer->state.subpass_sample_locs = NULL; -} - VKAPI_ATTR void VKAPI_CALL radv_CmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) { @@ -7674,7 +7653,14 @@ radv_CmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pS radv_cmd_buffer_end_subpass(cmd_buffer); - radv_cmd_buffer_end_render_pass(cmd_buffer); + vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer->state.attachments); + vk_free(&cmd_buffer->pool->vk.alloc, cmd_buffer->state.subpass_sample_locs); + + cmd_buffer->state.pass = NULL; + cmd_buffer->state.subpass = NULL; + cmd_buffer->state.attachments = NULL; + cmd_buffer->state.framebuffer = NULL; + cmd_buffer->state.subpass_sample_locs = NULL; } VKAPI_ATTR void VKAPI_CALL diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index d99243a3abe..e630c77e22c 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -2765,10 +2765,6 @@ si_conv_prim_to_gs_out(enum VkPrimitiveTopology topology) } } -void radv_cmd_buffer_begin_render_pass(struct radv_cmd_buffer *cmd_buffer, - const VkRenderPassBeginInfo *pRenderPassBegin); -void radv_cmd_buffer_end_render_pass(struct radv_cmd_buffer *cmd_buffer); - static inline uint32_t si_translate_prim(unsigned topology) { |