bug 14313: Rename ArraySlice to ArrayLayer
diff --git a/demos/cube.c b/demos/cube.c
index 0404f48..1816bc1 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -791,7 +791,7 @@
.aspect = VK_IMAGE_ASPECT_COLOR,
.baseMipLevel = 0,
.mipLevels = 1,
- .baseArraySlice = 0,
+ .baseArrayLayer = 0,
.arraySize = 1
},
.viewType = VK_IMAGE_VIEW_TYPE_2D,
@@ -844,7 +844,7 @@
.aspect = VK_IMAGE_ASPECT_DEPTH,
.baseMipLevel = 0,
.mipLevels = 1,
- .baseArraySlice = 0,
+ .baseArrayLayer = 0,
.arraySize = 1
},
.flags = 0,
@@ -1114,7 +1114,7 @@
const VkImageSubresource subres = {
.aspect = VK_IMAGE_ASPECT_COLOR,
.mipLevel = 0,
- .arraySlice = 0,
+ .arrayLayer = 0,
};
VkSubresourceLayout layout;
void *data;
diff --git a/demos/tri.c b/demos/tri.c
index 76f959c..86740c4 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -595,7 +595,7 @@
.aspect = VK_IMAGE_ASPECT_COLOR,
.baseMipLevel = 0,
.mipLevels = 1,
- .baseArraySlice = 0,
+ .baseArrayLayer = 0,
.arraySize = 1
},
.viewType = VK_IMAGE_VIEW_TYPE_2D,
@@ -650,7 +650,7 @@
.aspect = VK_IMAGE_ASPECT_DEPTH,
.baseMipLevel = 0,
.mipLevels = 1,
- .baseArraySlice = 0,
+ .baseArrayLayer = 0,
.arraySize = 1
},
.flags = 0,
@@ -759,7 +759,7 @@
const VkImageSubresource subres = {
.aspect = VK_IMAGE_ASPECT_COLOR,
.mipLevel = 0,
- .arraySlice = 0,
+ .arrayLayer = 0,
};
VkSubresourceLayout layout;
void *data;
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;
diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index 149d616..650f91b 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -3735,7 +3735,7 @@
view = fb->views[i];
range.baseMipLevel = view->mipLevel;
range.mipLevels = 1;
- range.baseArraySlice = view->baseArraySlice;
+ range.baseArrayLayer = view->baseArrayLayer;
range.arraySize = view->array_size;
if (view->is_rt) {
diff --git a/icd/intel/img.c b/icd/intel/img.c
index a1911b0..0094717 100644
--- a/icd/intel/img.c
+++ b/icd/intel/img.c
@@ -179,7 +179,7 @@
unsigned x, y;
intel_layout_get_slice_pos(&img->layout, pSubresource->mipLevel,
- pSubresource->arraySlice, &x, &y);
+ pSubresource->arrayLayer, &x, &y);
intel_layout_pos_to_mem(&img->layout, x, y, &x, &y);
pLayout->offset = intel_layout_mem_to_linear(&img->layout, x, y);
diff --git a/icd/intel/view.c b/icd/intel/view.c
index 0cb62a4..f45d616 100644
--- a/icd/intel/view.c
+++ b/icd/intel/view.c
@@ -1226,8 +1226,8 @@
mip_levels = img->mip_levels - info->subresourceRange.baseMipLevel;
array_size = info->subresourceRange.arraySize;
- if (array_size > img->array_size - info->subresourceRange.baseArraySlice)
- array_size = img->array_size - info->subresourceRange.baseArraySlice;
+ if (array_size > img->array_size - info->subresourceRange.baseArrayLayer)
+ array_size = img->array_size - info->subresourceRange.baseArrayLayer;
view->obj.destroy = img_view_destroy;
@@ -1261,13 +1261,13 @@
if (intel_gpu_gen(dev->gpu) >= INTEL_GEN(7)) {
surface_state_tex_gen7(dev->gpu, img, info->viewType, info->format,
info->subresourceRange.baseMipLevel, mip_levels,
- info->subresourceRange.baseArraySlice, array_size,
+ info->subresourceRange.baseArrayLayer, array_size,
state_swizzles, false, view->cmd);
view->cmd_len = 8;
} else {
surface_state_tex_gen6(dev->gpu, img, info->viewType, info->format,
info->subresourceRange.baseMipLevel, mip_levels,
- info->subresourceRange.baseArraySlice, array_size,
+ info->subresourceRange.baseArrayLayer, array_size,
false, view->cmd);
view->cmd_len = 6;
}
@@ -1282,7 +1282,7 @@
struct intel_img_view *view;
if (info->subresourceRange.baseMipLevel >= img->mip_levels ||
- info->subresourceRange.baseArraySlice >= img->array_size ||
+ info->subresourceRange.baseArrayLayer >= img->array_size ||
!info->subresourceRange.mipLevels ||
!info->subresourceRange.arraySize) {
/* TODOVV: Move test to validation layer */
@@ -1320,27 +1320,27 @@
att_view->img = img;
att_view->mipLevel = info->subresourceRange.baseMipLevel;
- att_view->baseArraySlice = info->subresourceRange.baseArraySlice;
+ att_view->baseArrayLayer = info->subresourceRange.baseArrayLayer;
att_view->array_size = info->subresourceRange.arraySize;
view_type = img_type_to_view_type(img->type,
- info->subresourceRange.baseArraySlice,
+ info->subresourceRange.baseArrayLayer,
info->subresourceRange.arraySize);
att_view_init_for_input(att_view, dev->gpu, img, view_type, info->format,
info->subresourceRange.baseMipLevel,
- info->subresourceRange.baseArraySlice,
+ info->subresourceRange.baseArrayLayer,
info->subresourceRange.arraySize);
if (img->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
att_view_init_for_ds(att_view, dev->gpu, img, view_type, img->layout.format,
info->subresourceRange.baseMipLevel,
- info->subresourceRange.baseArraySlice,
+ info->subresourceRange.baseArrayLayer,
info->subresourceRange.arraySize);
} else {
att_view_init_for_rt(att_view, dev->gpu, img, view_type, info->format,
info->subresourceRange.baseMipLevel,
- info->subresourceRange.baseArraySlice,
+ info->subresourceRange.baseArrayLayer,
info->subresourceRange.arraySize);
}
}
diff --git a/icd/intel/view.h b/icd/intel/view.h
index f8a1f2b..dabe78b 100644
--- a/icd/intel/view.h
+++ b/icd/intel/view.h
@@ -57,7 +57,7 @@
struct intel_img *img;
uint32_t mipLevel;
- uint32_t baseArraySlice;
+ uint32_t baseArrayLayer;
uint32_t array_size;
/* SURFACE_STATE for readback */
diff --git a/include/vulkan.h b/include/vulkan.h
index 8218a67..62a352e 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -128,7 +128,7 @@
#define VK_LOD_CLAMP_NONE 1000.0f
#define VK_REMAINING_MIP_LEVELS (~0U)
-#define VK_REMAINING_ARRAY_SLICES (~0U)
+#define VK_REMAINING_ARRAY_LAYERS (~0U)
#define VK_WHOLE_SIZE (~0ULL)
#define VK_ATTACHMENT_UNUSED (~0U)
#define VK_TRUE 1
@@ -1423,7 +1423,7 @@
typedef struct {
VkImageAspect aspect;
uint32_t mipLevel;
- uint32_t arraySlice;
+ uint32_t arrayLayer;
} VkImageSubresource;
typedef struct {
@@ -1523,7 +1523,7 @@
VkImageAspect aspect;
uint32_t baseMipLevel;
uint32_t mipLevels;
- uint32_t baseArraySlice;
+ uint32_t baseArrayLayer;
uint32_t arraySize;
} VkImageSubresourceRange;
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 21962fa..7a98f7b 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -94,7 +94,7 @@
region.bufferOffset = offset;
region.imageSubresource.mipLevel = lv;
- region.imageSubresource.arraySlice = 0;
+ region.imageSubresource.arrayLayer = 0;
region.imageExtent = Image::extent(info_.extent, lv);
if (info_.usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
@@ -130,7 +130,7 @@
VkBufferImageCopy region = regions_[i];
region.bufferOffset += slice_pitch * slice;
- region.imageSubresource.arraySlice = slice;
+ region.imageSubresource.arrayLayer = slice;
regions_.push_back(region);
}
}
@@ -144,10 +144,10 @@
for (std::vector<VkImageSubresourceRange>::const_iterator it = ranges.begin();
it != ranges.end(); it++) {
for (uint32_t lv = 0; lv < it->mipLevels; lv++) {
- for (uint32_t slice = 0; slice < it->arraySize; slice++) {
+ for (uint32_t layer = 0; layer < it->arraySize; layer++) {
VkBufferImageCopy region = {};
region.bufferOffset = offset;
- region.imageSubresource = Image::subresource(*it, lv, slice);
+ region.imageSubresource = Image::subresource(*it, lv, layer);
region.imageExtent = Image::extent(info_.extent, lv);
regions_.push_back(region);
@@ -276,7 +276,7 @@
const unsigned char input[] = {
HASH_BYTES(hash_salt_),
HASH_BYTES(subres.mipLevel),
- HASH_BYTES(subres.arraySlice),
+ HASH_BYTES(subres.arrayLayer),
HASH_BYTES(offset.x),
HASH_BYTES(offset.y),
HASH_BYTES(offset.z),
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 51ec509..fed5eae 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -285,7 +285,7 @@
viewInfo.channels.b = VK_CHANNEL_SWIZZLE_B;
viewInfo.channels.a = VK_CHANNEL_SWIZZLE_A;
- viewInfo.subresourceRange.baseArraySlice = 0;
+ viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.arraySize = 1;
viewInfo.subresourceRange.baseMipLevel = 0;
viewInfo.subresourceRange.mipLevels = 1;
diff --git a/tests/init.cpp b/tests/init.cpp
index a191555..00b68ae 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -381,14 +381,14 @@
// {
// VkImageAspect aspect;
// uint32_t mipLevel;
-// uint32_t arraySlice;
+// uint32_t arrayLayer;
// } VkImageSubresource;
if (image_fmt.linearTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) {
VkImageSubresource subresource = {};
subresource.aspect = VK_IMAGE_ASPECT_COLOR;
- subresource.arraySlice = 0;
+ subresource.arrayLayer = 0;
_w = w;
_h = h;
@@ -459,7 +459,7 @@
viewInfo.channels.b = VK_CHANNEL_SWIZZLE_B;
viewInfo.channels.a = VK_CHANNEL_SWIZZLE_A;
- viewInfo.subresourceRange.baseArraySlice = 0;
+ viewInfo.subresourceRange.baseArrayLayer = 0;
viewInfo.subresourceRange.arraySize = 1;
viewInfo.subresourceRange.baseMipLevel = 0;
viewInfo.subresourceRange.mipLevels = 1;
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index b43eeaa..7274be4 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -892,7 +892,7 @@
.pNext = NULL,
.image = dsi,
.mipLevel = 0,
- .baseArraySlice = 0,
+ .baseArrayLayer = 0,
.arraySize = 1,
.flags = 0,
};
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 9a83141..708cab8 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -803,13 +803,13 @@
VkImageCopy copy_region = {};
copy_region.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR;
- copy_region.srcSubresource.arraySlice = 0;
+ copy_region.srcSubresource.arrayLayer = 0;
copy_region.srcSubresource.mipLevel = 0;
copy_region.srcOffset.x = 0;
copy_region.srcOffset.y = 0;
copy_region.srcOffset.z = 0;
copy_region.destSubresource.aspect = VK_IMAGE_ASPECT_COLOR;
- copy_region.destSubresource.arraySlice = 0;
+ copy_region.destSubresource.arrayLayer = 0;
copy_region.destSubresource.mipLevel = 0;
copy_region.destOffset.x = 0;
copy_region.destOffset.y = 0;
@@ -865,7 +865,7 @@
view.subresourceRange.aspect = VK_IMAGE_ASPECT_COLOR;
view.subresourceRange.baseMipLevel = 0;
view.subresourceRange.mipLevels = 1;
- view.subresourceRange.baseArraySlice = 0;
+ view.subresourceRange.baseArrayLayer = 0;
view.subresourceRange.arraySize = 1;
/* create image */
@@ -1360,8 +1360,8 @@
srRange.aspect = VK_IMAGE_ASPECT_COLOR;
srRange.baseMipLevel = 0;
srRange.mipLevels = VK_REMAINING_MIP_LEVELS;
- srRange.baseArraySlice = 0;
- srRange.arraySize = VK_REMAINING_ARRAY_SLICES;
+ srRange.baseArrayLayer = 0;
+ srRange.arraySize = VK_REMAINING_ARRAY_LAYERS;
VkImageMemoryBarrier memory_barrier = {};
memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -1392,8 +1392,8 @@
dsRange.aspect = VK_IMAGE_ASPECT_DEPTH;
dsRange.baseMipLevel = 0;
dsRange.mipLevels = VK_REMAINING_MIP_LEVELS;
- dsRange.baseArraySlice = 0;
- dsRange.arraySize = VK_REMAINING_ARRAY_SLICES;
+ dsRange.baseArrayLayer = 0;
+ dsRange.arraySize = VK_REMAINING_ARRAY_LAYERS;
// prepare the depth buffer for clear
@@ -1447,8 +1447,8 @@
srRange.aspect = VK_IMAGE_ASPECT_COLOR;
srRange.baseMipLevel = 0;
srRange.mipLevels = VK_REMAINING_MIP_LEVELS;
- srRange.baseArraySlice = 0;
- srRange.arraySize = VK_REMAINING_ARRAY_SLICES;
+ srRange.baseArrayLayer = 0;
+ srRange.arraySize = VK_REMAINING_ARRAY_LAYERS;
VkImageMemoryBarrier memory_barrier = {};
memory_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
@@ -1617,7 +1617,7 @@
view_info.subresourceRange.aspect = VK_IMAGE_ASPECT_DEPTH;
view_info.subresourceRange.baseMipLevel = 0;
view_info.subresourceRange.mipLevels = 1;
- view_info.subresourceRange.baseArraySlice = 0;
+ view_info.subresourceRange.baseArrayLayer = 0;
view_info.subresourceRange.arraySize = 1;
view_info.flags = 0;
view_info.format = m_depth_stencil_fmt;
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 805bcde..56e44bd 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -416,10 +416,10 @@
}
static VkImageCreateInfo create_info();
- static VkImageSubresource subresource(VkImageAspect aspect, uint32_t mip_level, uint32_t array_slice);
- static VkImageSubresource subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_slice);
+ static VkImageSubresource subresource(VkImageAspect aspect, uint32_t mip_level, uint32_t array_layer);
+ static VkImageSubresource subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer);
static VkImageSubresourceRange subresource_range(VkImageAspect aspect, uint32_t base_mip_level, uint32_t mip_levels,
- uint32_t base_array_slice, uint32_t array_size);
+ uint32_t base_array_layer, uint32_t array_size);
static VkImageSubresourceRange subresource_range(const VkImageCreateInfo &info, VkImageAspect aspect);
static VkImageSubresourceRange subresource_range(const VkImageSubresource &subres);
@@ -708,28 +708,28 @@
return info;
}
-inline VkImageSubresource Image::subresource(VkImageAspect aspect, uint32_t mip_level, uint32_t array_slice)
+inline VkImageSubresource Image::subresource(VkImageAspect aspect, uint32_t mip_level, uint32_t array_layer)
{
VkImageSubresource subres = {};
subres.aspect = aspect;
subres.mipLevel = mip_level;
- subres.arraySlice = array_slice;
+ subres.arrayLayer = array_layer;
return subres;
}
-inline VkImageSubresource Image::subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_slice)
+inline VkImageSubresource Image::subresource(const VkImageSubresourceRange &range, uint32_t mip_level, uint32_t array_layer)
{
- return subresource(range.aspect, range.baseMipLevel + mip_level, range.baseArraySlice + array_slice);
+ return subresource(range.aspect, range.baseMipLevel + mip_level, range.baseArrayLayer + array_layer);
}
inline VkImageSubresourceRange Image::subresource_range(VkImageAspect aspect, uint32_t base_mip_level, uint32_t mip_levels,
- uint32_t base_array_slice, uint32_t array_size)
+ uint32_t base_array_layer, uint32_t array_size)
{
VkImageSubresourceRange range = {};
range.aspect = aspect;
range.baseMipLevel = base_mip_level;
range.mipLevels = mip_levels;
- range.baseArraySlice = base_array_slice;
+ range.baseArrayLayer = base_array_layer;
range.arraySize = array_size;
return range;
}
@@ -741,7 +741,7 @@
inline VkImageSubresourceRange Image::subresource_range(const VkImageSubresource &subres)
{
- return subresource_range(subres.aspect, subres.mipLevel, 1, subres.arraySlice, 1);
+ return subresource_range(subres.aspect, subres.mipLevel, 1, subres.arrayLayer, 1);
}
inline VkExtent2D Image::extent(int32_t width, int32_t height)
diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 2e24bff..ab8020c 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -922,7 +922,7 @@
color_image_view.subresourceRange.aspect = VK_IMAGE_ASPECT_COLOR;
color_image_view.subresourceRange.baseMipLevel = 0;
color_image_view.subresourceRange.mipLevels = 1;
- color_image_view.subresourceRange.baseArraySlice = 0;
+ color_image_view.subresourceRange.baseArrayLayer = 0;
color_image_view.subresourceRange.arraySize = 1;
m_buffers[i].image = swapchainImages[i];