diff options
| -rw-r--r-- | demos/cube.c | 4 | ||||
| -rw-r--r-- | demos/tri.c | 4 | ||||
| -rw-r--r-- | icd/nulldrv/nulldrv.c | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 5 | ||||
| -rw-r--r-- | layers/device_limits.cpp | 2 | ||||
| -rw-r--r-- | layers/image.h | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/demos/cube.c b/demos/cube.c index 7cb70577..1ac36321 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -854,7 +854,7 @@ static void demo_prepare_depth(struct demo *demo) .format = depth_format, .extent = { demo->width, demo->height, 1 }, .mipLevels = 1, - .arraySize = 1, + .arrayLayers = 1, .samples = 1, .tiling = VK_IMAGE_TILING_OPTIMAL, .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, @@ -996,7 +996,7 @@ static void demo_prepare_texture_image(struct demo *demo, .format = tex_format, .extent = { tex_width, tex_height, 1 }, .mipLevels = 1, - .arraySize = 1, + .arrayLayers = 1, .samples = 1, .tiling = tiling, .usage = usage, diff --git a/demos/tri.c b/demos/tri.c index e21b0ad2..ec7eca0a 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -663,7 +663,7 @@ static void demo_prepare_depth(struct demo *demo) .format = depth_format, .extent = { demo->width, demo->height, 1 }, .mipLevels = 1, - .arraySize = 1, + .arrayLayers = 1, .samples = 1, .tiling = VK_IMAGE_TILING_OPTIMAL, .usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, @@ -757,7 +757,7 @@ static void demo_prepare_texture_image(struct demo *demo, .format = tex_format, .extent = { tex_width, tex_height, 1 }, .mipLevels = 1, - .arraySize = 1, + .arrayLayers = 1, .samples = 1, .tiling = tiling, .usage = usage, diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index a4b76cbe..e0991b1e 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -282,7 +282,7 @@ static VkResult nulldrv_img_create(struct nulldrv_dev *dev, img->type = info->imageType; img->depth = info->extent.depth; img->mip_levels = info->mipLevels; - img->array_size = info->arraySize; + img->array_size = info->arrayLayers; img->usage = info->usage; img->samples = info->samples; diff --git a/include/vulkan.h b/include/vulkan.h index 8a86edd3..8bc88627 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1484,7 +1484,7 @@ typedef struct { VkFormat format; VkExtent3D extent; uint32_t mipLevels; - uint32_t arraySize; + uint32_t arrayLayers; uint32_t samples; VkImageTiling tiling; VkImageUsageFlags usage; @@ -2005,8 +2005,7 @@ typedef struct { } VkClearAttachment; typedef struct { - VkOffset3D offset; - VkExtent3D extent; + VkRect2D rect; uint32_t baseArrayLayer; uint32_t numLayers; } VkClearRect; diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index eded3573..1217a75c 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -523,7 +523,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( uint64_t totalSize = ((uint64_t)pCreateInfo->extent.width * (uint64_t)pCreateInfo->extent.height * (uint64_t)pCreateInfo->extent.depth * - (uint64_t)pCreateInfo->arraySize * + (uint64_t)pCreateInfo->arrayLayers * (uint64_t)pCreateInfo->samples * (uint64_t)vk_format_get_size(pCreateInfo->format) + (uint64_t)imageGranularity ) & ~(uint64_t)imageGranularity; diff --git a/layers/image.h b/layers/image.h index e1738c84..cce4b9cd 100644 --- a/layers/image.h +++ b/layers/image.h @@ -52,7 +52,7 @@ typedef struct _IMAGE_STATE _IMAGE_STATE():mipLevels(0), arraySize(0), format(VK_FORMAT_UNDEFINED), samples(0), imageType(VK_IMAGE_TYPE_NUM) {}; _IMAGE_STATE(const VkImageCreateInfo* pCreateInfo): mipLevels(pCreateInfo->mipLevels), - arraySize(pCreateInfo->arraySize), + arraySize(pCreateInfo->arrayLayers), format(pCreateInfo->format), samples(pCreateInfo->samples), imageType(pCreateInfo->imageType) |