layers: Update GetCBNode helper function
Change-Id: Ifdd18888e04cdf19566ca33da769c6cb1a3e6bb6
diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index a378b0f..de36ead 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -1689,7 +1689,7 @@
bool skip = false;
// TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto image_state = GetImageState(image);
if (cb_node && image_state) {
skip |= ValidateMemoryIsBoundToImage(device_data, image_state, "vkCmdClearColorImage()",
@@ -1718,7 +1718,7 @@
const VkImageSubresourceRange *pRanges) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto image_state = GetImageState(image);
if (cb_node && image_state) {
AddCommandBufferBindingImage(device_data, cb_node, image_state);
@@ -1735,7 +1735,7 @@
bool skip = false;
// TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto image_state = GetImageState(image);
if (cb_node && image_state) {
skip |= ValidateMemoryIsBoundToImage(device_data, image_state, "vkCmdClearDepthStencilImage()",
@@ -1786,7 +1786,7 @@
const VkImageSubresourceRange *pRanges) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto image_state = GetImageState(image);
if (cb_node && image_state) {
AddCommandBufferBindingImage(device_data, cb_node, image_state);
@@ -2454,7 +2454,7 @@
VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount,
const VkImageCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_image_state = GetImageState(dstImage);
bool skip = false;
@@ -2731,7 +2731,7 @@
VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount,
const VkImageCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_image_state = GetImageState(dstImage);
@@ -2794,7 +2794,7 @@
const VkClearRect *pRects) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- GLOBAL_CB_NODE *cb_node = GetCBNode(device_data, commandBuffer);
+ GLOBAL_CB_NODE *cb_node = GetCBNode(commandBuffer);
bool skip = false;
if (cb_node) {
@@ -2923,7 +2923,7 @@
VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount,
const VkImageResolve *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_image_state = GetImageState(dstImage);
@@ -3021,7 +3021,7 @@
VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount,
const VkImageResolve *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_image_state = GetImageState(dstImage);
@@ -3034,7 +3034,7 @@
VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount,
const VkImageBlit *pRegions, VkFilter filter) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_image_state = GetImageState(dstImage);
@@ -3355,7 +3355,7 @@
VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount,
const VkImageBlit *pRegions, VkFilter filter) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_image_state = GetImageState(dstImage);
@@ -4435,7 +4435,7 @@
bool CoreChecks::PreCallValidateCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer,
uint32_t regionCount, const VkBufferCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_buffer_state = GetBufferState(srcBuffer);
auto dst_buffer_state = GetBufferState(dstBuffer);
@@ -4462,7 +4462,7 @@
void CoreChecks::PreCallRecordCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer,
uint32_t regionCount, const VkBufferCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_buffer_state = GetBufferState(srcBuffer);
auto dst_buffer_state = GetBufferState(dstBuffer);
@@ -4568,7 +4568,7 @@
bool CoreChecks::PreCallValidateCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset,
VkDeviceSize size, uint32_t data) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto buffer_state = GetBufferState(dstBuffer);
bool skip = false;
skip |= ValidateMemoryIsBoundToBuffer(device_data, buffer_state, "vkCmdFillBuffer()", "VUID-vkCmdFillBuffer-dstBuffer-00031");
@@ -4587,7 +4587,7 @@
void CoreChecks::PreCallRecordCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset,
VkDeviceSize size, uint32_t data) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto buffer_state = GetBufferState(dstBuffer);
// Update bindings between buffer and cmd buffer
AddCommandBufferBindingBuffer(device_data, cb_node, buffer_state);
@@ -4878,7 +4878,7 @@
bool CoreChecks::PreCallValidateCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout,
VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_buffer_state = GetBufferState(dstBuffer);
@@ -4950,7 +4950,7 @@
void CoreChecks::PreCallRecordCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout,
VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_image_state = GetImageState(srcImage);
auto dst_buffer_state = GetBufferState(dstBuffer);
@@ -4967,7 +4967,7 @@
VkImageLayout dstImageLayout, uint32_t regionCount,
const VkBufferImageCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_buffer_state = GetBufferState(srcBuffer);
auto dst_image_state = GetImageState(dstImage);
@@ -5035,7 +5035,7 @@
VkImageLayout dstImageLayout, uint32_t regionCount,
const VkBufferImageCopy *pRegions) {
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(commandBuffer), layer_data_map);
- auto cb_node = GetCBNode(device_data, commandBuffer);
+ auto cb_node = GetCBNode(commandBuffer);
auto src_buffer_state = GetBufferState(srcBuffer);
auto dst_image_state = GetImageState(dstImage);