From a35fef1ab27cd7b1d896738f8eddd6b4fa23c0cf Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 7 Jul 2015 16:22:23 -0700 Subject: [PATCH] vk/vulkan.h: Remove the pass argument from EndRenderPass --- include/vulkan/vulkan.h | 5 ++--- src/vulkan/device.c | 3 +-- src/vulkan/meta.c | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index a243f41f61f..0c50b877573 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -2010,7 +2010,7 @@ typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCmdBuffer cmdBuffer, VkPipelineLa typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer); typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass); typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBegin* pRenderPassBegin); -typedef void (VKAPI *PFN_vkCmdEndRenderPass)(VkCmdBuffer cmdBuffer, VkRenderPass renderPass); +typedef void (VKAPI *PFN_vkCmdEndRenderPass)(VkCmdBuffer cmdBuffer); typedef void (VKAPI *PFN_vkCmdExecuteCommands)(VkCmdBuffer cmdBuffer, uint32_t cmdBuffersCount, const VkCmdBuffer* pCmdBuffers); #ifdef VK_PROTOTYPES @@ -2632,8 +2632,7 @@ void VKAPI vkCmdBeginRenderPass( const VkRenderPassBegin* pRenderPassBegin); void VKAPI vkCmdEndRenderPass( - VkCmdBuffer cmdBuffer, - VkRenderPass renderPass); + VkCmdBuffer cmdBuffer); void VKAPI vkCmdExecuteCommands( VkCmdBuffer cmdBuffer, diff --git a/src/vulkan/device.c b/src/vulkan/device.c index 9654637b6e1..69fd335634b 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/device.c @@ -3726,8 +3726,7 @@ void anv_CmdBeginRenderPass( } void anv_CmdEndRenderPass( - VkCmdBuffer cmdBuffer, - VkRenderPass renderPass) + VkCmdBuffer cmdBuffer) { /* Emit a flushing pipe control at the end of a pass. This is kind of a * hack but it ensures that render targets always actually get written. diff --git a/src/vulkan/meta.c b/src/vulkan/meta.c index f4479512ea6..9bba3540a37 100644 --- a/src/vulkan/meta.c +++ b/src/vulkan/meta.c @@ -653,7 +653,7 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer, anv_CmdDraw((VkCmdBuffer) cmd_buffer, 0, 3, 0, 1); - anv_CmdEndRenderPass((VkCmdBuffer) cmd_buffer, pass); + anv_CmdEndRenderPass((VkCmdBuffer) cmd_buffer); /* At the point where we emit the draw call, all data from the * descriptor sets, etc. has been used. We are free to delete it. @@ -1272,7 +1272,7 @@ void anv_CmdClearColorImage( meta_emit_clear(cmd_buffer, 1, &instance_data); - anv_CmdEndRenderPass((VkCmdBuffer) cmd_buffer, pass); + anv_CmdEndRenderPass((VkCmdBuffer) cmd_buffer); } } } -- 2.30.2