commit 3dee8087999562e0637326175a3cf6cab858158e
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 10 16:38:41 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Sep 11 09:20:02 2015 -0600
tree 9636312f06aa0573f240f20b6c71bca6fadbd86a
parent 752957901902cd3de9b99ef272d7b7fbaeef2705

bug 14313: Rename ArraySlice to ArrayLayer

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index f51476c..90a3e2d 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -168,8 +168,8 @@
     info.subresourceRange.aspect = aspect;
     info.subresourceRange.baseMipLevel = 0;
     info.subresourceRange.mipLevels = VK_REMAINING_MIP_LEVELS;
-    info.subresourceRange.baseArraySlice = 0;
-    info.subresourceRange.arraySize = VK_REMAINING_ARRAY_SLICES;
+    info.subresourceRange.baseArrayLayer = 0;
+    info.subresourceRange.arraySize = VK_REMAINING_ARRAY_LAYERS;
 
     intel_img_view_init(cmd->dev, &info, view);
 
@@ -264,7 +264,7 @@
     info.format = format;
     info.subresourceRange.baseMipLevel = lod;
     info.subresourceRange.mipLevels = 1;
-    info.subresourceRange.baseArraySlice = layer;
+    info.subresourceRange.baseArrayLayer = layer;
     info.subresourceRange.arraySize = 1;
 
     intel_att_view_init(cmd->dev, &info, view);
@@ -326,7 +326,7 @@
     info.image.handle = (uint64_t)img;
     info.subresourceRange.baseMipLevel = lod;
     info.subresourceRange.mipLevels = 1;
-    info.subresourceRange.baseArraySlice = layer;
+    info.subresourceRange.baseArrayLayer = layer;
     info.subresourceRange.arraySize = 1;
 
     intel_att_view_init(cmd->dev, &info, &meta->ds.view);
@@ -521,13 +521,13 @@
                 (region->extent.depth > 1));
 
         meta.src.lod = region->srcSubresource.mipLevel;
-        meta.src.layer = region->srcSubresource.arraySlice +
+        meta.src.layer = region->srcSubresource.arrayLayer +
             region->srcOffset.z;
         meta.src.x = region->srcOffset.x;
         meta.src.y = region->srcOffset.y;
 
         meta.dst.lod = region->destSubresource.mipLevel;
-        meta.dst.layer = region->destSubresource.arraySlice +
+        meta.dst.layer = region->destSubresource.arrayLayer +
                 region->destOffset.z;
         meta.dst.x = region->destOffset.x;
         meta.dst.y = region->destOffset.y;
@@ -610,7 +610,7 @@
         meta.src.x = region->bufferOffset / icd_format_get_size(format);
 
         meta.dst.lod = region->imageSubresource.mipLevel;
-        meta.dst.layer = region->imageSubresource.arraySlice +
+        meta.dst.layer = region->imageSubresource.arrayLayer +
             region->imageOffset.z;
         meta.dst.x = region->imageOffset.x / block_width;
         meta.dst.y = region->imageOffset.y / block_width;
@@ -701,7 +701,7 @@
         uint32_t j;
 
         meta.src.lod = region->imageSubresource.mipLevel;
-        meta.src.layer = region->imageSubresource.arraySlice +
+        meta.src.layer = region->imageSubresource.arrayLayer +
             region->imageOffset.z;
         meta.src.x = region->imageOffset.x / block_width;
         meta.src.y = region->imageOffset.y / block_width;
@@ -817,20 +817,20 @@
     uint32_t i, j;
 
     if (range->baseMipLevel >= img->mip_levels ||
-        range->baseArraySlice >= img->array_size)
+        range->baseArrayLayer >= img->array_size)
         return;
 
     mip_levels = img->mip_levels - range->baseMipLevel;
     if (mip_levels > range->mipLevels)
         mip_levels = range->mipLevels;
 
-    array_size = img->array_size - range->baseArraySlice;
+    array_size = img->array_size - range->baseArrayLayer;
     if (array_size > range->arraySize)
         array_size = range->arraySize;
 
     for (i = 0; i < mip_levels; i++) {
         meta->dst.lod = range->baseMipLevel + i;
-        meta->dst.layer = range->baseArraySlice;
+        meta->dst.layer = range->baseArrayLayer;
 
         /* TODO INTEL_CMD_META_DS_HIZ_CLEAR requires 8x4 aligned rectangle */
         meta->width = u_minify(img->layout.width0, meta->dst.lod);
@@ -1101,16 +1101,16 @@
 
     for (i = 0; i < regionCount; i++) {
         const VkImageResolve *region = &pRegions[i];
-        int arraySlice;
+        int arrayLayer;
 
-        for(arraySlice = 0; arraySlice < region->extent.depth; arraySlice++) {
+        for(arrayLayer = 0; arrayLayer < region->extent.depth; arrayLayer++) {
             meta.src.lod = region->srcSubresource.mipLevel;
-            meta.src.layer = region->srcSubresource.arraySlice + arraySlice;
+            meta.src.layer = region->srcSubresource.arrayLayer + arrayLayer;
             meta.src.x = region->srcOffset.x;
             meta.src.y = region->srcOffset.y;
 
             meta.dst.lod = region->destSubresource.mipLevel;
-            meta.dst.layer = region->destSubresource.arraySlice + arraySlice;
+            meta.dst.layer = region->destSubresource.arrayLayer + arrayLayer;
             meta.dst.x = region->destOffset.x;
             meta.dst.y = region->destOffset.y;