vk/0.170.2: s/baseArraySlice/baseArrayLayer/

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 3498b46ab623eb146bf4b93dd380eec608cd643f..90df1cb5a5da99ba96552886095d9a12b653e99a 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1397,7 +1397,7 @@ typedef struct {
 typedef struct {
     VkImageAspect                               aspect;
     uint32_t                                    mipLevel;
-    uint32_t                                    arraySlice;
+    uint32_t                                    arrayLayer;
 } VkImageSubresource;
 
 typedef struct {
@@ -1496,7 +1496,7 @@ typedef struct {
     VkImageAspectFlags                          aspectMask;
     uint32_t                                    baseMipLevel;
     uint32_t                                    mipLevels;
-    uint32_t                                    baseArraySlice;
+    uint32_t                                    baseArrayLayer;
     uint32_t                                    arraySize;
 } VkImageSubresourceRange;
 

diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c
index 8eb5a603c2b074bb84643d732e18b847d7c4e35a..f0620e4d67edce7de2c484549fa299d601181c13 100644 (file)
--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -411,12 +411,12 @@ anv_validate_CreateImageView(VkDevice _device,
    assert(subresource->arraySize > 0);
    assert(subresource->baseMipLevel < image->levels);
    assert(subresource->baseMipLevel + subresource->mipLevels <= image->levels);
-   assert(subresource->baseArraySlice < image->array_size);
-   assert(subresource->baseArraySlice + subresource->arraySize <= image->array_size);
+   assert(subresource->baseArrayLayer < image->array_size);
+   assert(subresource->baseArrayLayer + subresource->arraySize <= image->array_size);
    assert(pView);
 
    if (view_info->is_cube) {
-      assert(subresource->baseArraySlice % 6 == 0);
+      assert(subresource->baseArrayLayer % 6 == 0);
       assert(subresource->arraySize % 6 == 0);
    }
 

diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index c214dc30a4c271a58c206f4c14f4e4e1884021cc..4abd8d3821354ccd1f9cd026b893c49bf0dff8d7 100644 (file)
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -1018,7 +1018,7 @@ do_buffer_copy(struct anv_cmd_buffer *cmd_buffer,
             .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
             .baseMipLevel = 0,
             .mipLevels = 1,
-            .baseArraySlice = 0,
+            .baseArrayLayer = 0,
             .arraySize = 1
          },
       },
@@ -1166,7 +1166,7 @@ void anv_CmdCopyImage(
                .aspectMask = 1 << pRegions[r].srcSubresource.aspect,
                .baseMipLevel = pRegions[r].srcSubresource.mipLevel,
                .mipLevels = 1,
-               .baseArraySlice = pRegions[r].srcSubresource.arrayLayer,
+               .baseArrayLayer = pRegions[r].srcSubresource.arrayLayer,
                .arraySize = 1
             },
          },
@@ -1255,7 +1255,7 @@ void anv_CmdBlitImage(
                .aspectMask = 1 << pRegions[r].srcSubresource.aspect,
                .baseMipLevel = pRegions[r].srcSubresource.mipLevel,
                .mipLevels = 1,
-               .baseArraySlice = pRegions[r].srcSubresource.arrayLayer,
+               .baseArrayLayer = pRegions[r].srcSubresource.arrayLayer,
                .arraySize = 1
             },
          },
@@ -1388,7 +1388,7 @@ void anv_CmdCopyBufferToImage(
                .aspectMask = 1 << proxy_aspect,
                .baseMipLevel = 0,
                .mipLevels = 1,
-               .baseArraySlice = 0,
+               .baseArrayLayer = 0,
                .arraySize = 1
             },
          },
@@ -1478,7 +1478,7 @@ void anv_CmdCopyImageToBuffer(
                .aspectMask = 1 << pRegions[r].imageSubresource.aspect,
                .baseMipLevel = pRegions[r].imageSubresource.mipLevel,
                .mipLevels = 1,
-               .baseArraySlice = pRegions[r].imageSubresource.arrayLayer,
+               .baseArrayLayer = pRegions[r].imageSubresource.arrayLayer,
                .arraySize = 1
             },
          },
@@ -1565,7 +1565,7 @@ void anv_CmdClearColorImage(
                   .image = _image,
                   .format = image->format->vk_format,
                   .mipLevel = pRanges[r].baseMipLevel + l,
-                  .baseArraySlice = pRanges[r].baseArraySlice + s,
+                  .baseArraySlice = pRanges[r].baseArrayLayer + s,
                   .arraySize = 1,
                },
                cmd_buffer);

diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index 1959b8b5a497b559a89605aac831e5c196c8b8c3..d7a4b10c6e869a4c55804fb68fdba666ab38e5c0 100644 (file)
--- a/src/vulkan/gen7_state.c
+++ b/src/vulkan/gen7_state.c
@@ -322,7 +322,7 @@ gen7_image_view_init(struct anv_image_view *iview,
       .Width = image->extent.width - 1,
       .Depth = depth - 1,
       .SurfacePitch = surface->stride - 1,
-      .MinimumArrayElement = range->baseArraySlice,
+      .MinimumArrayElement = range->baseArrayLayer,
       .NumberofMultisamples = MULTISAMPLECOUNT_1,
       .XOffset = 0,
       .YOffset = 0,

diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c
index d2a403b2f56656e2dec80ec61132a55e36d2428a..e836613db4240f067bc214da7dead3c8e7c3824c 100644 (file)
--- a/src/vulkan/gen8_state.c
+++ b/src/vulkan/gen8_state.c
@@ -243,7 +243,7 @@ gen8_image_view_init(struct anv_image_view *iview,
       .Depth = depth - 1,
       .SurfacePitch = surface->stride - 1,
       .RenderTargetViewExtent = rt_view_extent - 1,
-      .MinimumArrayElement = range->baseArraySlice,
+      .MinimumArrayElement = range->baseArrayLayer,
       .NumberofMultisamples = MULTISAMPLECOUNT_1,
       .XOffset = 0,
       .YOffset = 0,