diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-10 16:38:41 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-09-11 09:20:02 -0600 |
| commit | fc465b826fb673984296411f5065902f55b2b0ae (patch) | |
| tree | 28f09227876aba216c4a903bd0fb8981ecf74ea8 | |
| parent | 41eb54959fd8b3fa8580312221433c1a1ba919f2 (diff) | |
| download | usermoji-fc465b826fb673984296411f5065902f55b2b0ae.tar.xz | |
bug 14313: Rename ArraySlice to ArrayLayer
| -rw-r--r-- | demos/cube.c | 6 | ||||
| -rw-r--r-- | demos/tri.c | 6 | ||||
| -rw-r--r-- | include/vulkan.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/demos/cube.c b/demos/cube.c index 0404f482..1816bc11 100644 --- 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 76f959c1..86740c4c 100644 --- 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 8218a67f..62a352e3 100644 --- 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; |