diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-16 09:46:00 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-10-23 17:32:04 -0600 |
| commit | eae391ef15d8d0d5d1043e5471fc3fccc348ad3a (patch) | |
| tree | 0df8c57fb5984a6fa58fdcce3d76d5d3b27520c2 | |
| parent | dff021fa4c6027db3d8e9cc1d2322d121f273fc3 (diff) | |
| download | usermoji-eae391ef15d8d0d5d1043e5471fc3fccc348ad3a.tar.xz | |
bug-14786: Addressing layered subresources in vkCmdCopyImage
commit: ad27e2b Attempt at naming consistency
| -rw-r--r-- | demos/cube.c | 8 | ||||
| -rw-r--r-- | demos/tri.c | 8 | ||||
| -rw-r--r-- | include/vulkan.h | 10 | ||||
| -rw-r--r-- | layers/image.cpp | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/demos/cube.c b/demos/cube.c index 1ac36321..37e55fa5 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -819,9 +819,9 @@ static void demo_prepare_buffers(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, - .mipLevels = 1, + .numLevels = 1, .baseArrayLayer = 0, - .arraySize = 1 + .numLayers = 1 }, .viewType = VK_IMAGE_VIEW_TYPE_2D, .flags = 0, @@ -869,9 +869,9 @@ static void demo_prepare_depth(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT, .baseMipLevel = 0, - .mipLevels = 1, + .numLevels = 1, .baseArrayLayer = 0, - .arraySize = 1 + .numLayers = 1 }, .flags = 0, .viewType = VK_IMAGE_VIEW_TYPE_2D, diff --git a/demos/tri.c b/demos/tri.c index ec7eca0a..f79c67e5 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -626,9 +626,9 @@ static void demo_prepare_buffers(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, - .mipLevels = 1, + .numLevels = 1, .baseArrayLayer = 0, - .arraySize = 1 + .numLayers = 1 }, .viewType = VK_IMAGE_VIEW_TYPE_2D, .flags = 0, @@ -683,9 +683,9 @@ static void demo_prepare_depth(struct demo *demo) .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT, .baseMipLevel = 0, - .mipLevels = 1, + .numLevels = 1, .baseArrayLayer = 0, - .arraySize = 1 + .numLayers = 1 }, .flags = 0, .viewType = VK_IMAGE_VIEW_TYPE_2D, diff --git a/include/vulkan.h b/include/vulkan.h index 8bc88627..fd7d2074 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1179,7 +1179,7 @@ typedef struct { typedef struct { VkExtent3D maxExtent; uint32_t maxMipLevels; - uint32_t maxArraySize; + uint32_t maxArrayLayers; VkSampleCountFlags sampleCounts; VkDeviceSize maxResourceSize; } VkImageFormatProperties; @@ -1512,9 +1512,9 @@ typedef struct { typedef struct { VkImageAspectFlags aspectMask; uint32_t baseMipLevel; - uint32_t mipLevels; + uint32_t numLevels; uint32_t baseArrayLayer; - uint32_t arraySize; + uint32_t numLayers; } VkImageSubresourceRange; typedef struct { @@ -1952,8 +1952,8 @@ typedef struct { typedef struct { VkImageAspectFlags aspect; uint32_t mipLevel; - uint32_t arrayLayer; - uint32_t arraySize; + uint32_t baseArrayLayer; + uint32_t numLayers; } VkImageSubresourceCopy; typedef struct { diff --git a/layers/image.cpp b/layers/image.cpp index e40536af..a49ded8e 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -400,12 +400,12 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageV ss << "vkCreateImageView called with baseArrayLayer " << pCreateInfo->subresourceRange.baseArrayLayer << " for image " << pCreateInfo->image.handle << " that only has " << imageEntry->second->arraySize << " mip levels."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_VIEW_CREATE_ERROR, "IMAGE", ss.str().c_str()); } - if (!pCreateInfo->subresourceRange.mipLevels) { + if (!pCreateInfo->subresourceRange.numLevels) { std::stringstream ss; ss << "vkCreateImageView called with 0 in pCreateInfo->subresourceRange.mipLevels."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_VIEW_CREATE_ERROR, "IMAGE", ss.str().c_str()); } - if (!pCreateInfo->subresourceRange.arraySize) { + if (!pCreateInfo->subresourceRange.numLayers) { std::stringstream ss; ss << "vkCreateImageView called with 0 in pCreateInfo->subresourceRange.arraySize."; skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, IMAGE_VIEW_CREATE_ERROR, "IMAGE", ss.str().c_str()); |