vk: Remove stale finishme for stencil image views
authorChad Versace <chad.versace@intel.com>
Wed, 7 Oct 2015 01:53:29 +0000 (18:53 -0700)
committerChad Versace <chad.versace@intel.com>
Wed, 7 Oct 2015 04:22:18 +0000 (21:22 -0700)
They don't work completely. But they work well enough to satisfy
Crucible.

src/vulkan/anv_image.c
src/vulkan/anv_meta.c

index b95cadca9e71cdc534d6e3a01f609168eee18057..2b3c444428f24305c7b7500985bfa1756bddb22a 100644 (file)
@@ -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
index 7646071276ac767d184f2f559c1369293335a528..d69863b8375f31dc8cb07c9a9330be9ef1922cce 100644 (file)
@@ -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