Module: Mesa Branch: master Commit: d7c5b7398b411d7f758019d976aea1f1ca1822ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7c5b7398b411d7f758019d976aea1f1ca1822ee
Author: Samuel Pitoiset <[email protected]> Date: Mon Mar 15 15:40:13 2021 +0100 lavapipe: use common entrypoints for VK_KHR_create_renderpass2 Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9601> --- src/gallium/frontends/lavapipe/lvp_cmd_buffer.c | 52 +++++++------------------ 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c b/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c index e7a942fa1b1..fdaea6292da 100644 --- a/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c +++ b/src/gallium/frontends/lavapipe/lvp_cmd_buffer.c @@ -344,14 +344,14 @@ state_setup_attachments(struct lvp_attachment_state *attachments, } } -VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderPass( - VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo* pRenderPassBegin, - VkSubpassContents contents) +VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderPass2( + VkCommandBuffer commandBuffer, + const VkRenderPassBeginInfo* pRenderPassBeginInfo, + const VkSubpassBeginInfo* pSubpassBeginInfo) { LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer); - LVP_FROM_HANDLE(lvp_render_pass, pass, pRenderPassBegin->renderPass); - LVP_FROM_HANDLE(lvp_framebuffer, framebuffer, pRenderPassBegin->framebuffer); + LVP_FROM_HANDLE(lvp_render_pass, pass, pRenderPassBeginInfo->renderPass); + LVP_FROM_HANDLE(lvp_framebuffer, framebuffer, pRenderPassBeginInfo->framebuffer); struct lvp_cmd_buffer_entry *cmd; uint32_t cmd_size = pass->attachment_count * sizeof(struct lvp_attachment_state); @@ -361,26 +361,18 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderPass( cmd->u.begin_render_pass.render_pass = pass; cmd->u.begin_render_pass.framebuffer = framebuffer; - cmd->u.begin_render_pass.render_area = pRenderPassBegin->renderArea; + cmd->u.begin_render_pass.render_area = pRenderPassBeginInfo->renderArea; cmd->u.begin_render_pass.attachments = (struct lvp_attachment_state *)(cmd + 1); - state_setup_attachments(cmd->u.begin_render_pass.attachments, pass, pRenderPassBegin->pClearValues); + state_setup_attachments(cmd->u.begin_render_pass.attachments, pass, pRenderPassBeginInfo->pClearValues); cmd_buf_queue(cmd_buffer, cmd); } -VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderPass2( +VKAPI_ATTR void VKAPI_CALL lvp_CmdNextSubpass2( VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo* pRenderPassBeginInfo, - const VkSubpassBeginInfo* pSubpassBeginInfo) -{ - lvp_CmdBeginRenderPass(commandBuffer, pRenderPassBeginInfo, - pSubpassBeginInfo->contents); -} - -VKAPI_ATTR void VKAPI_CALL lvp_CmdNextSubpass( - VkCommandBuffer commandBuffer, - VkSubpassContents contents) + const VkSubpassBeginInfo* pSubpassBeginInfo, + const VkSubpassEndInfo* pSubpassEndInfo) { LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer); struct lvp_cmd_buffer_entry *cmd; @@ -389,19 +381,11 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdNextSubpass( if (!cmd) return; - cmd->u.next_subpass.contents = contents; + cmd->u.next_subpass.contents = pSubpassBeginInfo->contents; cmd_buf_queue(cmd_buffer, cmd); } -VKAPI_ATTR void VKAPI_CALL lvp_CmdNextSubpass2( - VkCommandBuffer commandBuffer, - const VkSubpassBeginInfo* pSubpassBeginInfo, - const VkSubpassEndInfo* pSubpassEndInfo) -{ - lvp_CmdNextSubpass(commandBuffer, pSubpassBeginInfo->contents); -} - VKAPI_ATTR void VKAPI_CALL lvp_CmdBindVertexBuffers( VkCommandBuffer commandBuffer, uint32_t firstBinding, @@ -521,8 +505,9 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdDraw( cmd_buf_queue(cmd_buffer, cmd); } -VKAPI_ATTR void VKAPI_CALL lvp_CmdEndRenderPass( - VkCommandBuffer commandBuffer) +VKAPI_ATTR void VKAPI_CALL lvp_CmdEndRenderPass2( + VkCommandBuffer commandBuffer, + const VkSubpassEndInfo* pSubpassEndInfo) { LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer); struct lvp_cmd_buffer_entry *cmd; @@ -534,13 +519,6 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdEndRenderPass( cmd_buf_queue(cmd_buffer, cmd); } -VKAPI_ATTR void VKAPI_CALL lvp_CmdEndRenderPass2( - VkCommandBuffer commandBuffer, - const VkSubpassEndInfo* pSubpassEndInfo) -{ - lvp_CmdEndRenderPass(commandBuffer); -} - VKAPI_ATTR void VKAPI_CALL lvp_CmdSetViewport( VkCommandBuffer commandBuffer, uint32_t firstViewport, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
