v133: Update parameters on CmdPipelineBarrier

7 files changed, 15 insertions, 15 deletions

diff --git a/demos/cube.c b/demos/cube.c
index e3952bfe..98c4671a 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -474,7 +474,7 @@ static void demo_set_image_layout(
     VkPipelineStageFlags src_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
     VkPipelineStageFlags dest_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
 
-    vkCmdPipelineBarrier(demo->cmd, src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+    vkCmdPipelineBarrier(demo->cmd, src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
 }
 
 static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf)
diff --git a/demos/tri.c b/demos/tri.c
index a0236b09..32c65ba9 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -315,7 +315,7 @@ static void demo_set_image_layout(
     VkPipelineStageFlags src_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
     VkPipelineStageFlags dest_stages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
 
-    vkCmdPipelineBarrier(demo->setup_cmd, src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+    vkCmdPipelineBarrier(demo->setup_cmd, src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
 }
 
 static void demo_draw_build_cmd(struct demo *demo)
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index f497c524..bf1c64bf 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1277,11 +1277,11 @@ void VKAPI vkCmdWaitEvents(
 
 void VKAPI vkCmdPipelineBarrier(
     VkCmdBuffer                                 cmdBuffer,
-    VkPipelineStageFlags                        sourceStageMask,
+    VkPipelineStageFlags                        srcStageMask,
     VkPipelineStageFlags                        destStageMask,
     VkBool32                                    byRegion,
     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 2114b8bc..b65bef77 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2694,7 +2694,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t event
     }
 }
 
-VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memBarrierCount, const void** ppMemBarriers)
+VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, 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 816b1be3..f003496d 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -7909,7 +7909,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(
 
 bool PreCmdPipelineBarrier(
     VkCmdBuffer cmdBuffer,
-    const void** ppMemBarriers)
+    const void* const* ppMemBarriers)
 {
     if(ppMemBarriers == nullptr)
     {
@@ -7923,7 +7923,7 @@ bool PreCmdPipelineBarrier(
 
 bool PostCmdPipelineBarrier(
     VkCmdBuffer cmdBuffer,
-    VkPipelineStageFlags sourceStageMask,
+    VkPipelineStageFlags srcStageMask,
     VkPipelineStageFlags destStageMask,
     VkBool32 byRegion,
     uint32_t memBarrierCount)
@@ -7938,17 +7938,17 @@ bool PostCmdPipelineBarrier(
 
 VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(
     VkCmdBuffer cmdBuffer,
-    VkPipelineStageFlags sourceStageMask,
+    VkPipelineStageFlags srcStageMask,
     VkPipelineStageFlags destStageMask,
     VkBool32 byRegion,
     uint32_t memBarrierCount,
-    const void** ppMemBarriers)
+    const void* const* ppMemBarriers)
 {
     PreCmdPipelineBarrier(cmdBuffer, ppMemBarriers);
 
-    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, sourceStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
+    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
 
-    PostCmdPipelineBarrier(cmdBuffer, sourceStageMask, destStageMask, byRegion, memBarrierCount);
+    PostCmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount);
 }
 
 bool PostCmdBeginQuery(
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 71ec6749..66978c1b 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1379,13 +1379,13 @@ LOADER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCo
     disp->CmdWaitEvents(cmdBuffer, eventCount, pEvents, sourceStageMask, destStageMask, memBarrierCount, ppMemBarriers);
 }
 
-LOADER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memBarrierCount, const void** ppMemBarriers)
+LOADER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memBarrierCount, const void* const* ppMemBarriers)
 {
     const VkLayerDispatchTable *disp;
 
     disp = loader_get_dispatch(cmdBuffer);
 
-    disp->CmdPipelineBarrier(cmdBuffer, sourceStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
+    disp->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
 }
 
 LOADER_EXPORT void VKAPI vkCmdBeginQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags)
diff --git a/vulkan.py b/vulkan.py
index f006572f..5c115342 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -934,11 +934,11 @@ core = Extension(
 
         Proto("void", "CmdPipelineBarrier",
             [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkPipelineStageFlags", "sourceStageMask"),
+             Param("VkPipelineStageFlags", "srcStageMask"),
              Param("VkPipelineStageFlags", "destStageMask"),
              Param("VkBool32", "byRegion"),
              Param("uint32_t", "memBarrierCount"),
-             Param("const void**", "ppMemBarriers")]),
+             Param("const void* const*", "ppMemBarriers")]),
 
         Proto("void", "CmdBeginQuery",
             [Param("VkCmdBuffer", "cmdBuffer"),