Module: Mesa Branch: master Commit: 5cb6999bc310e48452eb96271ebab465482ec139 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cb6999bc310e48452eb96271ebab465482ec139
Author: Samuel Pitoiset <[email protected]> Date: Mon Mar 15 15:33:23 2021 +0100 radv: use common entrypoints for VK_KHR_create_renderpass2 Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9601> --- src/amd/vulkan/layers/radv_sqtt_layer.c | 21 ---------------- src/amd/vulkan/radv_cmd_buffer.c | 44 +++++++++------------------------ 2 files changed, 11 insertions(+), 54 deletions(-) diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index 251f7b5261d..30cd453b8e5 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/src/amd/vulkan/layers/radv_sqtt_layer.c @@ -801,14 +801,6 @@ void sqtt_CmdPushConstants( size, pValues); } -void sqtt_CmdBeginRenderPass( - VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo* pRenderPassBegin, - VkSubpassContents contents) -{ - API_MARKER(BeginRenderPass, commandBuffer, pRenderPassBegin, contents); -} - void sqtt_CmdBeginRenderPass2( VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBeginInfo, @@ -818,13 +810,6 @@ void sqtt_CmdBeginRenderPass2( pRenderPassBeginInfo, pSubpassBeginInfo); } -void sqtt_CmdNextSubpass( - VkCommandBuffer commandBuffer, - VkSubpassContents contents) -{ - API_MARKER(NextSubpass, commandBuffer, contents); -} - void sqtt_CmdNextSubpass2( VkCommandBuffer commandBuffer, const VkSubpassBeginInfo* pSubpassBeginInfo, @@ -834,12 +819,6 @@ void sqtt_CmdNextSubpass2( pSubpassBeginInfo, pSubpassEndInfo); } -void sqtt_CmdEndRenderPass( - VkCommandBuffer commandBuffer) -{ - API_MARKER(EndRenderPass, commandBuffer); -} - void sqtt_CmdEndRenderPass2( VkCommandBuffer commandBuffer, const VkSubpassEndInfo* pSubpassEndInfo) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 5122c0642fc..53afb7db47c 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -5209,36 +5209,16 @@ radv_cmd_buffer_begin_render_pass(struct radv_cmd_buffer *cmd_buffer, return; } -void radv_CmdBeginRenderPass( - VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo* pRenderPassBegin, - VkSubpassContents contents) -{ - RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - - radv_cmd_buffer_begin_render_pass(cmd_buffer, pRenderPassBegin, NULL); - - radv_cmd_buffer_begin_subpass(cmd_buffer, 0); -} - void radv_CmdBeginRenderPass2( VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo* pRenderPassBeginInfo, const VkSubpassBeginInfo* pSubpassBeginInfo) -{ - radv_CmdBeginRenderPass(commandBuffer, pRenderPassBeginInfo, - pSubpassBeginInfo->contents); -} - -void radv_CmdNextSubpass( - VkCommandBuffer commandBuffer, - VkSubpassContents contents) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - uint32_t prev_subpass = radv_get_subpass_id(cmd_buffer); - radv_cmd_buffer_end_subpass(cmd_buffer); - radv_cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1); + radv_cmd_buffer_begin_render_pass(cmd_buffer, pRenderPassBeginInfo, NULL); + + radv_cmd_buffer_begin_subpass(cmd_buffer, 0); } void radv_CmdNextSubpass2( @@ -5246,7 +5226,11 @@ void radv_CmdNextSubpass2( const VkSubpassBeginInfo* pSubpassBeginInfo, const VkSubpassEndInfo* pSubpassEndInfo) { - radv_CmdNextSubpass(commandBuffer, pSubpassBeginInfo->contents); + RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); + + uint32_t prev_subpass = radv_get_subpass_id(cmd_buffer); + radv_cmd_buffer_end_subpass(cmd_buffer); + radv_cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1); } static void radv_emit_view_index(struct radv_cmd_buffer *cmd_buffer, unsigned index) @@ -6095,8 +6079,9 @@ radv_cmd_buffer_end_render_pass(struct radv_cmd_buffer *cmd_buffer) cmd_buffer->state.subpass_sample_locs = NULL; } -void radv_CmdEndRenderPass( - VkCommandBuffer commandBuffer) +void radv_CmdEndRenderPass2( + VkCommandBuffer commandBuffer, + const VkSubpassEndInfo* pSubpassEndInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -6107,13 +6092,6 @@ void radv_CmdEndRenderPass( radv_cmd_buffer_end_render_pass(cmd_buffer); } -void radv_CmdEndRenderPass2( - VkCommandBuffer commandBuffer, - const VkSubpassEndInfo* pSubpassEndInfo) -{ - radv_CmdEndRenderPass(commandBuffer); -} - /* * For HTILE we have the following interesting clear words: * 0xfffff30f: Uncompressed, full depth range, for depth+stencil HTILE _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
