From 61543e3976d9cc27978665ad8812105e31d35789 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Fri, 28 Jul 2017 12:11:30 -0600 Subject: layers:Rename lambda function container Change name to queue_submit_functions to reflect the fact that validate functions in this container are executed at QueueSubmit() time. --- layers/buffer_validation.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'layers/buffer_validation.cpp') diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp index dca42478..a66c9dc2 100644 --- a/layers/buffer_validation.cpp +++ b/layers/buffer_validation.cpp @@ -1030,7 +1030,7 @@ void PreCallRecordCmdClearImage(layer_data *dev_data, VkCommandBuffer commandBuf SetImageMemoryValid(dev_data, image_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); for (uint32_t i = 0; i < rangeCount; ++i) { RecordClearImageLayout(dev_data, cb_node, image, pRanges[i], imageLayout); } @@ -1968,12 +1968,12 @@ void PreCallRecordCmdCopyImage(layer_data *device_data, GLOBAL_CB_NODE *cb_node, AddCommandBufferBindingImage(device_data, cb_node, src_image_state); AddCommandBufferBindingImage(device_data, cb_node, dst_image_state); std::function function = [=]() { return ValidateImageMemoryIsValid(device_data, src_image_state, "vkCmdCopyImage()"); }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); function = [=]() { SetImageMemoryValid(device_data, dst_image_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); } // Returns true if sub_rect is entirely contained within rect @@ -2184,12 +2184,12 @@ void PreCallRecordCmdResolveImage(layer_data *device_data, GLOBAL_CB_NODE *cb_no std::function function = [=]() { return ValidateImageMemoryIsValid(device_data, src_image_state, "vkCmdResolveImage()"); }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); function = [=]() { SetImageMemoryValid(device_data, dst_image_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); } bool PreCallValidateCmdBlitImage(layer_data *device_data, GLOBAL_CB_NODE *cb_node, IMAGE_STATE *src_image_state, @@ -2568,12 +2568,12 @@ void PreCallRecordCmdBlitImage(layer_data *device_data, GLOBAL_CB_NODE *cb_node, AddCommandBufferBindingImage(device_data, cb_node, dst_image_state); std::function function = [=]() { return ValidateImageMemoryIsValid(device_data, src_image_state, "vkCmdBlitImage()"); }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); function = [=]() { SetImageMemoryValid(device_data, dst_image_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); } // This validates that the initial layout specified in the command buffer for @@ -3360,12 +3360,12 @@ void PreCallRecordCmdCopyBuffer(layer_data *device_data, GLOBAL_CB_NODE *cb_node std::function function = [=]() { return ValidateBufferMemoryIsValid(device_data, src_buffer_state, "vkCmdCopyBuffer()"); }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); function = [=]() { SetBufferMemoryValid(device_data, dst_buffer_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); } static bool validateIdleBuffer(layer_data *device_data, VkBuffer buffer) { @@ -3466,7 +3466,7 @@ void PreCallRecordCmdFillBuffer(layer_data *device_data, GLOBAL_CB_NODE *cb_node SetBufferMemoryValid(device_data, buffer_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); // Update bindings between buffer and cmd buffer AddCommandBufferBindingBuffer(device_data, cb_node, buffer_state); } @@ -3836,12 +3836,12 @@ void PreCallRecordCmdCopyImageToBuffer(layer_data *device_data, GLOBAL_CB_NODE * std::function function = [=]() { return ValidateImageMemoryIsValid(device_data, src_image_state, "vkCmdCopyImageToBuffer()"); }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); function = [=]() { SetBufferMemoryValid(device_data, dst_buffer_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); } bool PreCallValidateCmdCopyBufferToImage(layer_data *device_data, VkImageLayout dstImageLayout, GLOBAL_CB_NODE *cb_node, @@ -3907,9 +3907,9 @@ void PreCallRecordCmdCopyBufferToImage(layer_data *device_data, GLOBAL_CB_NODE * SetImageMemoryValid(device_data, dst_image_state, true); return false; }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); function = [=]() { return ValidateBufferMemoryIsValid(device_data, src_buffer_state, "vkCmdCopyBufferToImage()"); }; - cb_node->validate_functions.push_back(function); + cb_node->queue_submit_functions.push_back(function); } bool PreCallValidateGetImageSubresourceLayout(layer_data *device_data, VkImage image, const VkImageSubresource *pSubresource) { -- cgit v1.2.3