diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-12 12:58:58 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-17 10:05:20 -0600 |
| commit | c003c9b6299623c6fcea65a6f3de2e0cc9ec571c (patch) | |
| tree | cb3af67157f5b02f55cc4b83e9e5b54418c0cff3 | |
| parent | 4a593f1521130ba94933cb384f32b763616be8ee (diff) | |
| download | usermoji-c003c9b6299623c6fcea65a6f3de2e0cc9ec571c.tar.xz | |
v133: Update parameter types on CmdWaitEvents
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 2 | ||||
| -rw-r--r-- | layers/draw_state.cpp | 2 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 4 | ||||
| -rw-r--r-- | loader/trampoline.c | 2 | ||||
| -rwxr-xr-x | vulkan.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 15077eee..f497c524 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1270,7 +1270,7 @@ void VKAPI vkCmdWaitEvents( VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, - const void** ppMemBarriers) + const void* const* ppMemBarriers) { NULLDRV_LOG_FUNC; } diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 4738426a..2114b8bc 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -2680,7 +2680,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdResetEvent(VkCmdBuffer cmdBuffer, VkEvent event, } } -VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void** ppMemBarriers) +VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers) { GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer); if (pCB) { diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 7a048618..816b1be3 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -7857,7 +7857,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdResetEvent( bool PreCmdWaitEvents( VkCmdBuffer cmdBuffer, const VkEvent* pEvents, - const void** ppMemBarriers) + const void* const* ppMemBarriers) { if(pEvents == nullptr) { @@ -7898,7 +7898,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents( VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, - const void** ppMemBarriers) + const void* const* ppMemBarriers) { PreCmdWaitEvents(cmdBuffer, pEvents, ppMemBarriers); diff --git a/loader/trampoline.c b/loader/trampoline.c index 358ab23d..71ec6749 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -1370,7 +1370,7 @@ LOADER_EXPORT void VKAPI vkCmdResetEvent(VkCmdBuffer cmdBuffer, VkEvent event, V disp->CmdResetEvent(cmdBuffer, event, stageMask); } -LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void** ppMemBarriers) +LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers) { const VkLayerDispatchTable *disp; @@ -930,7 +930,7 @@ core = Extension( Param("VkPipelineStageFlags", "sourceStageMask"), Param("VkPipelineStageFlags", "destStageMask"), Param("uint32_t", "memBarrierCount"), - Param("const void**", "ppMemBarriers")]), + Param("const void* const*", "ppMemBarriers")]), Proto("void", "CmdPipelineBarrier", [Param("VkCmdBuffer", "cmdBuffer"), |