diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-08 12:06:32 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-08 12:19:22 -0700 |
| commit | f1317351f4afa204d7ee34a8ce802bc021731e87 (patch) | |
| tree | 5078566c9f136b9a2dc4afc3ca4eb6c18b2e75ea | |
| parent | 4e6fc7e6f8b5646eef51edb663289dfd0adff3c4 (diff) | |
tests/miptree: Use the correct usage bits for images
| -rw-r--r-- | src/tests/func/miptree/miptree.c | 54 |
1 files changed, 46 insertions, 8 deletions
diff --git a/src/tests/func/miptree/miptree.c b/src/tests/func/miptree/miptree.c index 37002cb..4e7517d 100644 --- a/src/tests/func/miptree/miptree.c +++ b/src/tests/func/miptree/miptree.c @@ -437,12 +437,29 @@ miptree_create(void) const uint32_t depth = params->depth; const uint32_t array_length = params->array_length; const size_t buffer_size = miptree_calc_buffer_size(); - const uint32_t usage_bits = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | - VK_IMAGE_USAGE_TRANSFER_DST_BIT | - VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | - VK_IMAGE_USAGE_SAMPLED_BIT; VkImageType image_type = image_type_from_image_view_type(params->view_type); + uint32_t usage_bits = 0; + switch (params->upload_method) { + case MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER: + case MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE: + usage_bits |= VK_IMAGE_USAGE_TRANSFER_DST_BIT; + break; + case MIPTREE_UPLOAD_METHOD_COPY_WITH_DRAW: + usage_bits |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + break; + } + + switch (params->download_method) { + case MIPTREE_DOWNLOAD_METHOD_COPY_TO_BUFFER: + case MIPTREE_DOWNLOAD_METHOD_COPY_TO_LINEAR_IMAGE: + usage_bits |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + break; + case MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW: + usage_bits |= VK_IMAGE_USAGE_SAMPLED_BIT; + break; + } + // Determine if an image can be created with this combination can_create_image(image_type, VK_IMAGE_TILING_OPTIMAL, usage_bits, format); @@ -511,6 +528,7 @@ miptree_create(void) void *src_pixels = src_buffer_map + buffer_offset; void *dest_pixels = dest_buffer_map + buffer_offset; + uint32_t src_usage, dest_usage; VkImage src_vk_image; VkImage dest_vk_image; @@ -520,10 +538,20 @@ miptree_create(void) break; case MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE: case MIPTREE_UPLOAD_METHOD_COPY_WITH_DRAW: + switch (params->upload_method) { + case MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE: + src_usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + break; + case MIPTREE_UPLOAD_METHOD_COPY_WITH_DRAW: + src_usage = VK_IMAGE_USAGE_SAMPLED_BIT; + break; + default: + assert(!"Unreachable"); + } // Determine if an image can be created with this combination can_create_image(VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_LINEAR, - VK_IMAGE_USAGE_TRANSFER_SRC_BIT, format); + src_usage, format); src_vk_image = qoCreateImage(t_device, .format = format, @@ -535,7 +563,7 @@ miptree_create(void) .depth = 1, }, .tiling = VK_IMAGE_TILING_LINEAR, - .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT); + .usage = src_usage); qoBindImageMemory(t_device, src_vk_image, src_buffer_mem, buffer_offset); break; @@ -547,10 +575,20 @@ miptree_create(void) break; case MIPTREE_DOWNLOAD_METHOD_COPY_TO_LINEAR_IMAGE: case MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW: + switch (params->download_method) { + case MIPTREE_DOWNLOAD_METHOD_COPY_TO_LINEAR_IMAGE: + dest_usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT; + break; + case MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW: + dest_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + break; + default: + assert(!"Unreachable"); + } // Determine if an image can be created with this combination can_create_image(VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_LINEAR, - VK_IMAGE_USAGE_TRANSFER_DST_BIT, format); + dest_usage, format); dest_vk_image = qoCreateImage(t_device, .format = format, @@ -562,7 +600,7 @@ miptree_create(void) .depth = 1, }, .tiling = VK_IMAGE_TILING_LINEAR, - .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT); + .usage = dest_usage); qoBindImageMemory(t_device, dest_vk_image, dest_buffer_mem, buffer_offset); break; |