diff options
| author | Chad Versace <[email protected]> | 2015-10-06 18:53:29 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2015-10-06 21:22:18 -0700 |
| commit | 3fc2b1f32540ee8c3fa994814b69568c64c74d81 (patch) | |
| tree | b264145a92d8ca6e02c122e0cf9e781be4c44f10 | |
| parent | 44143a1f4658143b8acc4aaf515603f9507442f1 (diff) | |
vk: Remove stale finishme for stencil image views
They don't work completely. But they work well enough to satisfy
Crucible.
| -rw-r--r-- | src/vulkan/anv_image.c | 1 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c index b95cadca9e7..2b3c444428f 100644 --- a/src/vulkan/anv_image.c +++ b/src/vulkan/anv_image.c @@ -545,7 +545,6 @@ anv_image_get_surface_for_aspect_mask(struct anv_image *image, VkImageAspectFlag return &image->depth_surface; case VK_IMAGE_ASPECT_STENCIL_BIT: assert(image->format->has_stencil); - anv_finishme("stencil image views"); return &image->stencil_surface; case VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT: /* FINISHME: The Vulkan spec (git a511ba2) requires support for combined diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index 7646071276a..d69863b8375 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -985,12 +985,16 @@ do_buffer_copy(struct anv_cmd_buffer *cmd_buffer, .arraySize = 1, .samples = 1, .tiling = VK_IMAGE_TILING_LINEAR, - .usage = VK_IMAGE_USAGE_SAMPLED_BIT, + .usage = 0, .flags = 0, }; - VkImage src_image, dest_image; + VkImage src_image; + image_info.usage = VK_IMAGE_USAGE_SAMPLED_BIT; anv_CreateImage(vk_device, &image_info, &src_image); + + VkImage dest_image; + image_info.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; anv_CreateImage(vk_device, &image_info, &dest_image); /* We could use a vk call to bind memory, but that would require |