aboutsummaryrefslogtreecommitdiff
path: root/layers/core_validation.cpp
diff options
context:
space:
mode:
authorMark Lobodzinski <mark@lunarg.com>2017-01-31 14:54:24 -0700
committerMark Lobodzinski <mark@lunarg.com>2017-02-01 07:30:11 -0700
commitaeb444ab91a155f8c1357a23dfc56a4ce24ea6fb (patch)
tree499f7bedf37494e3ddcdb24a4a4b8c7a143b99c4 /layers/core_validation.cpp
parent6e455375ab1c6296cd2ddfabc050d5d81483fb74 (diff)
downloadusermoji-aeb444ab91a155f8c1357a23dfc56a4ce24ea6fb.tar.xz
layers: Fix var names for ClearImageLayout funcs
Change-Id: I66c42d591d70b816788cb1ab457d8d674fb5cbe5
Diffstat (limited to 'layers/core_validation.cpp')
-rw-r--r--layers/core_validation.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 099a428f..292f52b6 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -8212,8 +8212,8 @@ static bool VerifyClearImageLayout(layer_data *dev_data, GLOBAL_CB_NODE *cb_node
VkImageLayout dest_image_layout, const char *func_name) {
bool skip = false;
- VkImageSubresourceRange resolvedRange = range;
- ResolveRemainingLevelsLayers(dev_data, &resolvedRange, image);
+ VkImageSubresourceRange resolved_range = range;
+ ResolveRemainingLevelsLayers(dev_data, &resolved_range, image);
if (dest_image_layout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) {
if (dest_image_layout == VK_IMAGE_LAYOUT_GENERAL) {
@@ -8239,11 +8239,11 @@ static bool VerifyClearImageLayout(layer_data *dev_data, GLOBAL_CB_NODE *cb_node
}
}
- for (uint32_t levelIdx = 0; levelIdx < resolvedRange.levelCount; ++levelIdx) {
- uint32_t level = levelIdx + resolvedRange.baseMipLevel;
- for (uint32_t layerIdx = 0; layerIdx < resolvedRange.layerCount; ++layerIdx) {
- uint32_t layer = layerIdx + resolvedRange.baseArrayLayer;
- VkImageSubresource sub = {resolvedRange.aspectMask, level, layer};
+ for (uint32_t level_index = 0; level_index < resolved_range.levelCount; ++level_index) {
+ uint32_t level = level_index + resolved_range.baseMipLevel;
+ for (uint32_t layer_index = 0; layer_index < resolved_range.layerCount; ++layer_index) {
+ uint32_t layer = layer_index + resolved_range.baseArrayLayer;
+ VkImageSubresource sub = {resolved_range.aspectMask, level, layer};
IMAGE_CMD_BUF_LAYOUT_NODE node;
if (FindLayout(cb_node, image, sub, node)) {
if (node.layout != dest_image_layout) {
@@ -8269,14 +8269,14 @@ static bool VerifyClearImageLayout(layer_data *dev_data, GLOBAL_CB_NODE *cb_node
static void RecordClearImageLayout(layer_data *dev_data, GLOBAL_CB_NODE *cb_node, VkImage image, VkImageSubresourceRange range,
VkImageLayout dest_image_layout) {
- VkImageSubresourceRange resolvedRange = range;
- ResolveRemainingLevelsLayers(dev_data, &resolvedRange, image);
-
- for (uint32_t levelIdx = 0; levelIdx < resolvedRange.levelCount; ++levelIdx) {
- uint32_t level = levelIdx + resolvedRange.baseMipLevel;
- for (uint32_t layerIdx = 0; layerIdx < resolvedRange.layerCount; ++layerIdx) {
- uint32_t layer = layerIdx + resolvedRange.baseArrayLayer;
- VkImageSubresource sub = {resolvedRange.aspectMask, level, layer};
+ VkImageSubresourceRange resolved_range = range;
+ ResolveRemainingLevelsLayers(dev_data, &resolved_range, image);
+
+ for (uint32_t level_index = 0; level_index < resolved_range.levelCount; ++level_index) {
+ uint32_t level = level_index + resolved_range.baseMipLevel;
+ for (uint32_t layer_index = 0; layer_index < resolved_range.layerCount; ++layer_index) {
+ uint32_t layer = layer_index + resolved_range.baseArrayLayer;
+ VkImageSubresource sub = {resolved_range.aspectMask, level, layer};
IMAGE_CMD_BUF_LAYOUT_NODE node;
if (!FindLayout(cb_node, image, sub, node)) {
SetLayout(cb_node, image, sub, IMAGE_CMD_BUF_LAYOUT_NODE(dest_image_layout, dest_image_layout));