From 85c0d69be96b4bcd1404e2782064a33254a46c2b Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Tue, 7 Jul 2015 15:49:57 -0700 Subject: [PATCH] vk/0.130: Update vkCmdWaitEvents() signature --- include/vulkan/vulkan.h | 5 +++-- src/vulkan/device.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index d03fb9928a0..e8e117edff5 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1986,7 +1986,7 @@ typedef void (VKAPI *PFN_vkCmdClearDepthStencil)(VkCmdBuffer cmdBuffer, VkImage typedef void (VKAPI *PFN_vkCmdResolveImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageResolve* pRegions); typedef void (VKAPI *PFN_vkCmdSetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent); typedef void (VKAPI *PFN_vkCmdResetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent); -typedef void (VKAPI *PFN_vkCmdWaitEvents)(VkCmdBuffer cmdBuffer, VkWaitEvent waitEvent, uint32_t eventCount, const VkEvent* pEvents, uint32_t memBarrierCount, const void** ppMemBarriers); +typedef void (VKAPI *PFN_vkCmdWaitEvents)(VkCmdBuffer cmdBuffer, VkWaitEvent waitEvent, uint32_t eventCount, const VkEvent* pEvents, VkPipeEventFlags pipeEventMask, uint32_t memBarrierCount, const void* const* ppMemBarriers); typedef void (VKAPI *PFN_vkCmdPipelineBarrier)(VkCmdBuffer cmdBuffer, VkWaitEvent waitEvent, VkPipeEventFlags pipeEventMask, uint32_t memBarrierCount, const void* const* ppMemBarriers); typedef void (VKAPI *PFN_vkCmdBeginQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags); typedef void (VKAPI *PFN_vkCmdEndQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot); @@ -2544,8 +2544,9 @@ void VKAPI vkCmdWaitEvents( VkWaitEvent waitEvent, uint32_t eventCount, const VkEvent* pEvents, + VkPipeEventFlags pipeEventMask, uint32_t memBarrierCount, - const void** ppMemBarriers); + const void* const* ppMemBarriers); void VKAPI vkCmdPipelineBarrier( VkCmdBuffer cmdBuffer, diff --git a/src/vulkan/device.c b/src/vulkan/device.c index 8b1894c933d..cc00057b826 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/device.c @@ -3396,8 +3396,9 @@ void anv_CmdWaitEvents( VkWaitEvent waitEvent, uint32_t eventCount, const VkEvent* pEvents, + VkPipeEventFlags pipeEventMask, uint32_t memBarrierCount, - const void** ppMemBarriers) + const void* const* ppMemBarriers) { stub(); } -- 2.30.2