bug 14313: Rename ArraySlice to ArrayLayer

diff --git a/demos/cube.c b/demos/cube.c
index 0404f482c3de91c65930c9a079f3371b5474a00f..1816bc118356cdb484bf204b5da766a296492412 100644 (file)
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -791,7 +791,7 @@ static void demo_prepare_buffers(struct demo *demo)
                 .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 @@ static void demo_prepare_depth(struct demo *demo)
             .aspect = VK_IMAGE_ASPECT_DEPTH,
             .baseMipLevel = 0,
             .mipLevels = 1,
-            .baseArraySlice = 0,
+            .baseArrayLayer = 0,
             .arraySize = 1
         },
         .flags = 0,
@@ -1114,7 +1114,7 @@ static void demo_prepare_texture_image(struct demo *demo,
         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 76f959c16bd74b07a0dd56e8ed5ce5b07a8afa49..86740c4cc03aa043c9ed8a3a0f6761e06c418fac 100644 (file)
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -595,7 +595,7 @@ static void demo_prepare_buffers(struct demo *demo)
                 .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 @@ static void demo_prepare_depth(struct demo *demo)
             .aspect = VK_IMAGE_ASPECT_DEPTH,
             .baseMipLevel = 0,
             .mipLevels = 1,
-            .baseArraySlice = 0,
+            .baseArrayLayer = 0,
             .arraySize = 1
         },
         .flags = 0,
@@ -759,7 +759,7 @@ static void demo_prepare_texture_image(struct demo *demo,
         const VkImageSubresource subres = {
             .aspect = VK_IMAGE_ASPECT_COLOR,
             .mipLevel = 0,
-            .arraySlice = 0,
+            .arrayLayer = 0,
         };
         VkSubresourceLayout layout;
         void *data;

diff --git a/include/vulkan.h b/include/vulkan.h
index 8218a67f20c69115f7bab550c3f6e47bae646cf0..62a352e3e206a245c78c0589743289f244631114 100644 (file)
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -128,7 +128,7 @@ VK_DEFINE_NONDISP_HANDLE(VkCmdPool)
 
 #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 {
 typedef struct {
     VkImageAspect                               aspect;
     uint32_t                                    mipLevel;
-    uint32_t                                    arraySlice;
+    uint32_t                                    arrayLayer;
 } VkImageSubresource;
 
 typedef struct {
@@ -1523,7 +1523,7 @@ typedef struct {
     VkImageAspect                               aspect;
     uint32_t                                    baseMipLevel;
     uint32_t                                    mipLevels;
-    uint32_t                                    baseArraySlice;
+    uint32_t                                    baseArrayLayer;
     uint32_t                                    arraySize;
 } VkImageSubresourceRange;