v133: Update parameters on CmdPipelineBarrier
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 2114b8b..b65bef7 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2694,7 +2694,7 @@
}
}
-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 816b1be..f003496 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -7909,7 +7909,7 @@
bool PreCmdPipelineBarrier(
VkCmdBuffer cmdBuffer,
- const void** ppMemBarriers)
+ const void* const* ppMemBarriers)
{
if(ppMemBarriers == nullptr)
{
@@ -7923,7 +7923,7 @@
bool PostCmdPipelineBarrier(
VkCmdBuffer cmdBuffer,
- VkPipelineStageFlags sourceStageMask,
+ VkPipelineStageFlags srcStageMask,
VkPipelineStageFlags destStageMask,
VkBool32 byRegion,
uint32_t memBarrierCount)
@@ -7938,17 +7938,17 @@
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 71ec674..66978c1 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1379,13 +1379,13 @@
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/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 4508c4e..a4becd1 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -787,7 +787,7 @@
VkPipelineStageFlags src_stages = VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
VkPipelineStageFlags dest_stages = VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
- vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
VkBufferCopy region = {};
region.copySize = 4;
@@ -796,7 +796,7 @@
memory_barrier = bufs[1].buffer_memory_barrier(
VK_MEMORY_OUTPUT_TRANSFER_BIT, VK_MEMORY_INPUT_TRANSFER_BIT, 0, 4);
pmemory_barrier = &memory_barrier;
- vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
vkCmdCopyBuffer(cmd_.handle(), bufs[1].handle(), bufs[2].handle(), 1, ®ion);
@@ -1231,13 +1231,13 @@
VkPipelineStageFlags src_stages = VK_PIPELINE_STAGE_ALL_GPU_COMMANDS;
VkPipelineStageFlags dest_stages = VK_PIPELINE_STAGE_ALL_GPU_COMMANDS;
- vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void **)&p_to_clear[0]);
+ vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void * const*)&p_to_clear[0]);
vkCmdClearColorImage(cmd_.handle(),
img.handle(), VK_IMAGE_LAYOUT_GENERAL,
&clear_color, ranges.size(), &ranges[0]);
- vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void **)&p_to_xfer[0]);
+ vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, 1, (const void * const*)&p_to_xfer[0]);
cmd_.end();
@@ -1411,14 +1411,14 @@
VkPipelineStageFlags src_stages = VK_PIPELINE_STAGE_ALL_GPU_COMMANDS;
VkPipelineStageFlags dest_stages = VK_PIPELINE_STAGE_ALL_GPU_COMMANDS;
- vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, to_clear.size(), (const void **)&p_to_clear[0]);
+ vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, to_clear.size(), (const void * const*)&p_to_clear[0]);
vkCmdClearDepthStencilImage(cmd_.handle(),
img.handle(), VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
depth, stencil,
ranges.size(), &ranges[0]);
- vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, to_xfer.size(), (const void **)&p_to_xfer[0]);
+ vkCmdPipelineBarrier(cmd_.handle(), src_stages, dest_stages, false, to_xfer.size(), (const void * const*)&p_to_xfer[0]);
cmd_.end();
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index f16f8c0..0f48b15 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -583,7 +583,7 @@
VkPipelineStageFlags dest_stages = VK_PIPELINE_STAGE_ALL_GPU_COMMANDS;
// write barrier to the command buffer
- vkCmdPipelineBarrier(cmd_buf->handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier(cmd_buf->handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
}
void VkImageObj::SetLayout(VkCommandBufferObj *cmd_buf,
@@ -1272,7 +1272,7 @@
return VK_SUCCESS;
}
-void VkCommandBufferObj::PipelineBarrier(VkPipelineStageFlags src_stages, VkPipelineStageFlags dest_stages, VkBool32 byRegion, uint32_t memBarrierCount, const void** ppMemBarriers)
+void VkCommandBufferObj::PipelineBarrier(VkPipelineStageFlags src_stages, VkPipelineStageFlags dest_stages, VkBool32 byRegion, uint32_t memBarrierCount, const void* const* ppMemBarriers)
{
vkCmdPipelineBarrier(handle(), src_stages, dest_stages, byRegion, memBarrierCount, ppMemBarriers);
}
@@ -1311,7 +1311,7 @@
for (i = 0; i < m_renderTargets.size(); i++) {
memory_barrier.image = m_renderTargets[i]->image();
memory_barrier.oldLayout = m_renderTargets[i]->layout();
- vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
m_renderTargets[i]->layout(memory_barrier.newLayout);
vkCmdClearColorImage(handle(),
@@ -1336,7 +1336,7 @@
memory_barrier.image = depthStencilObj->handle();
memory_barrier.subresourceRange = dsRange;
- vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
vkCmdClearDepthStencilImage(handle(),
depthStencilObj->handle(), VK_IMAGE_LAYOUT_GENERAL,
@@ -1348,7 +1348,7 @@
memory_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL;
memory_barrier.newLayout = depthStencilObj->BindInfo()->layout;
memory_barrier.subresourceRange = dsRange;
- vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
}
}
@@ -1394,7 +1394,7 @@
{
memory_barrier.image = m_renderTargets[i]->image();
memory_barrier.oldLayout = m_renderTargets[i]->layout();
- vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void **)&pmemory_barrier);
+ vkCmdPipelineBarrier( handle(), src_stages, dest_stages, false, 1, (const void * const*)&pmemory_barrier);
m_renderTargets[i]->layout(memory_barrier.newLayout);
}
}
diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index d00185a..6a72bd3 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -162,7 +162,7 @@
VkResult BeginCommandBuffer();
VkResult BeginCommandBuffer(VkCmdBufferBeginInfo *pInfo);
VkResult EndCommandBuffer();
- void PipelineBarrier(VkPipelineStageFlags src_stages, VkPipelineStageFlags dest_stages, VkBool32 byRegion, uint32_t memBarrierCount, const void** ppMemBarriers);
+ void PipelineBarrier(VkPipelineStageFlags src_stages, VkPipelineStageFlags dest_stages, VkBool32 byRegion, uint32_t memBarrierCount, const void* const* ppMemBarriers);
void AddRenderTarget(VkImageObj *renderTarget);
void AddDepthStencil();
void ClearAllBuffers(VkClearColorValue clear_color, float depth_clear_color, uint32_t stencil_clear_color, VkDepthStencilObj *depthStencilObj);
diff --git a/vulkan.py b/vulkan.py
index f006572..5c11534 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -934,11 +934,11 @@
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"),