bug 14918 part1: consistency/cleanup ideas (from jbolz/pdaniell/dkoch) (WIP)
Change alignment types and replace byRegion by VkDependencyFlags.
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14918
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index c66ff41..b80b9b4 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -3166,7 +3166,7 @@
dev_data->device_dispatch_table->CmdWaitEvents(cmdBuffer, eventCount, pEvents, sourceStageMask, destStageMask, memBarrierCount, ppMemBarriers);
}
-VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memBarrierCount, const void* const* ppMemBarriers)
+VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkDependencyFlags dependencyFlags, uint32_t memBarrierCount, const void* const* ppMemBarriers)
{
VkBool32 skipCall = VK_FALSE;
layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map);
@@ -3180,7 +3180,7 @@
}
}
if (VK_FALSE == skipCall)
- dev_data->device_dispatch_table->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
+ dev_data->device_dispatch_table->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount, ppMemBarriers);
}
VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags)
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 2849efb..7dbc081 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -6196,7 +6196,7 @@
VkCmdBuffer cmdBuffer,
VkPipelineStageFlags srcStageMask,
VkPipelineStageFlags destStageMask,
- VkBool32 byRegion,
+ VkDependencyFlags dependencyFlags,
uint32_t memBarrierCount)
{
@@ -6211,15 +6211,15 @@
VkCmdBuffer cmdBuffer,
VkPipelineStageFlags srcStageMask,
VkPipelineStageFlags destStageMask,
- VkBool32 byRegion,
+ VkDependencyFlags dependencyFlags,
uint32_t memBarrierCount,
const void* const* ppMemBarriers)
{
PreCmdPipelineBarrier(cmdBuffer, ppMemBarriers);
- get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers);
+ get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount, ppMemBarriers);
- PostCmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount);
+ PostCmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, dependencyFlags, memBarrierCount);
}
bool PostCmdBeginQuery(