layers: Fix ValidateCmdBufImageLayouts for style

Var names and clang-format.

Change-Id: I974b36bca41d85fda392c61d19e271c7f0792de1

1 files changed, 26 insertions, 30 deletions

diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 0b58b866..5e337252 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -1501,46 +1501,42 @@ void PreCallRecordCmdBlitImage(core_validation::layer_data *device_data, GLOBAL_
     UpdateCmdBufferLastCmd(device_data, cb_node, CMD_BLITIMAGE);
 }
 
-// This validates that the initial layout specified in the command buffer for
-// the IMAGE is the same
-// as the global IMAGE layout
-bool ValidateCmdBufImageLayouts(core_validation::layer_data *dev_data, GLOBAL_CB_NODE *pCB) {
-    const debug_report_data *report_data = core_validation::GetReportData(dev_data);
-    bool skip_call = false;
+// This validates that the initial layout specified in the command buffer for the IMAGE is the same as the global IMAGE layout
+bool ValidateCmdBufImageLayouts(core_validation::layer_data *device_data, GLOBAL_CB_NODE *pCB) {
+    const debug_report_data *report_data = core_validation::GetReportData(device_data);
+    bool skip = false;
     for (auto cb_image_data : pCB->imageLayoutMap) {
         VkImageLayout imageLayout;
-        if (!FindGlobalLayout(dev_data, cb_image_data.first, imageLayout)) {
-            skip_call |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
-                VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS",
-                "Cannot submit cmd buffer using deleted image 0x%" PRIx64 ".",
-                reinterpret_cast<const uint64_t &>(cb_image_data.first));
+        if (!FindGlobalLayout(device_data, cb_image_data.first, imageLayout)) {
+            skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, 0, __LINE__,
+                            DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", "Cannot submit cmd buffer using deleted image 0x%" PRIx64 ".",
+                            reinterpret_cast<const uint64_t &>(cb_image_data.first));
         } else {
             if (cb_image_data.second.initialLayout == VK_IMAGE_LAYOUT_UNDEFINED) {
                 // TODO: Set memory invalid which is in mem_tracker currently
             } else if (imageLayout != cb_image_data.second.initialLayout) {
                 if (cb_image_data.first.hasSubresource) {
-                    skip_call |= log_msg(
-                        report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
-                        reinterpret_cast<uint64_t &>(pCB->commandBuffer), __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS",
-                        "Cannot submit cmd buffer using image (0x%" PRIx64
-                        ") [sub-resource: aspectMask 0x%X array layer %u, mip level %u], "
-                        "with layout %s when first use is %s.",
-                        reinterpret_cast<const uint64_t &>(cb_image_data.first.image), cb_image_data.first.subresource.aspectMask,
-                        cb_image_data.first.subresource.arrayLayer, cb_image_data.first.subresource.mipLevel,
-                        string_VkImageLayout(imageLayout), string_VkImageLayout(cb_image_data.second.initialLayout));
+                    skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
+                                    reinterpret_cast<uint64_t &>(pCB->commandBuffer), __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT,
+                                    "DS", "Cannot submit cmd buffer using image (0x%" PRIx64
+                                          ") [sub-resource: aspectMask 0x%X array layer %u, mip level %u], "
+                                          "with layout %s when first use is %s.",
+                                    reinterpret_cast<const uint64_t &>(cb_image_data.first.image),
+                                    cb_image_data.first.subresource.aspectMask, cb_image_data.first.subresource.arrayLayer,
+                                    cb_image_data.first.subresource.mipLevel, string_VkImageLayout(imageLayout),
+                                    string_VkImageLayout(cb_image_data.second.initialLayout));
                 } else {
-                    skip_call |=
-                        log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
-                            VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT, reinterpret_cast<uint64_t &>(pCB->commandBuffer),
-                            __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", "Cannot submit cmd buffer using image (0x%" PRIx64
-                            ") with layout %s when "
-                            "first use is %s.",
-                            reinterpret_cast<const uint64_t &>(cb_image_data.first.image), string_VkImageLayout(imageLayout),
-                            string_VkImageLayout(cb_image_data.second.initialLayout));
+                    skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT,
+                                    reinterpret_cast<uint64_t &>(pCB->commandBuffer), __LINE__, DRAWSTATE_INVALID_IMAGE_LAYOUT,
+                                    "DS", "Cannot submit cmd buffer using image (0x%" PRIx64
+                                          ") with layout %s when "
+                                          "first use is %s.",
+                                    reinterpret_cast<const uint64_t &>(cb_image_data.first.image),
+                                    string_VkImageLayout(imageLayout), string_VkImageLayout(cb_image_data.second.initialLayout));
                 }
             }
-            SetGlobalLayout(dev_data, cb_image_data.first, cb_image_data.second.layout);
+            SetGlobalLayout(device_data, cb_image_data.first, cb_image_data.second.layout);
         }
     }
-    return skip_call;
+    return skip;
 }