Reland "Fill in usage flags and sample fields on skia GrVkImageInfo."

This is a reland of f2038e2b

Original change's description:
> Fill in usage flags and sample fields on skia GrVkImageInfo.
>
> Change-Id: I1da7035e84173f5e9d8021ec3d2639f2ba96bf89
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469261
> Reviewed-by: Peng Huang <penghuang@chromium.org>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Cr-Commit-Position: refs/heads/master@{#817141}

Change-Id: I698bd77637392d3ea48cae69b271a80715bf4bff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2475534Reviewed-by: Peng Huang <penghuang@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Cr-Commit-Position: refs/heads/master@{#817569}

components/viz/service/display_embedder/skia_output_device_vulkan.cc

@@ -200,6 +200,8 @@ SkSurface* SkiaOutputDeviceVulkan::BeginPaint(
     vk_image_info.fImageTiling = VK_IMAGE_TILING_OPTIMAL;
     vk_image_info.fImageLayout = scoped_write_->image_layout();
     vk_image_info.fFormat = surface_format;
+    vk_image_info.fImageUsageFlags = scoped_write_->image_usage();
+    vk_image_info.fSampleCount = 1;
     vk_image_info.fLevelCount = 1;
     vk_image_info.fCurrentQueueFamily = VK_QUEUE_FAMILY_IGNORED;
     vk_image_info.fProtected =

gpu/command_buffer/service/external_vk_image_backing.cc

@@ -227,6 +227,12 @@ std::unique_ptr<ExternalVkImageBacking> ExternalVkImageBacking::Create(
         VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
   }
 
+  if (usage & SHARED_IMAGE_USAGE_DISPLAY) {
+    // Skia currently requires all VkImages it uses to support transfers
+    vk_usage |=
+        VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+  }
+
   auto* vulkan_implementation =
       context_state->vk_context_provider()->GetVulkanImplementation();
   VkImageCreateFlags vk_flags = 0;

gpu/command_buffer/service/external_vk_image_factory_unittest.cc

@@ -208,6 +208,7 @@ TEST_F(ExternalVkImageFactoryTest, DawnWrite_SkiaVulkanRead) {
     auto sk_image = SkImage::MakeFromTexture(
         context_state_->gr_context(), backend_texture, kTopLeft_GrSurfaceOrigin,
         kRGBA_8888_SkColorType, kOpaque_SkAlphaType, nullptr);
+    EXPECT_TRUE(sk_image);
 
     const SkImageInfo dst_info =
         SkImageInfo::Make(size.width(), size.height(), kRGBA_8888_SkColorType,

gpu/command_buffer/service/skia_utils.cc

@@ -219,6 +219,8 @@ GrVkImageInfo CreateGrVkImageInfo(VulkanImage* image) {
   image_info.fImageTiling = image->image_tiling();
   image_info.fImageLayout = image->image_layout();
   image_info.fFormat = image->format();
+  image_info.fImageUsageFlags = image->usage();
+  image_info.fSampleCount = 1;
   image_info.fLevelCount = 1;
   image_info.fCurrentQueueFamily = image->queue_family_index();
   image_info.fProtected = is_protected ? GrProtected::kYes : GrProtected::kNo;

gpu/vulkan/demo/vulkan_demo.cc

@@ -120,6 +120,8 @@ void VulkanDemo::CreateSkSurface() {
     vk_image_info.fImageLayout = scoped_write_->image_layout();
     vk_image_info.fImageTiling = VK_IMAGE_TILING_OPTIMAL;
     vk_image_info.fFormat = VK_FORMAT_B8G8R8A8_UNORM;
+    vk_image_info.fImageUsageFlags = scoped_write_->image_usage();
+    vk_image_info.fSampleCount = 1;
     vk_image_info.fLevelCount = 1;
     const auto& size = vulkan_surface_->image_size();
     GrBackendRenderTarget render_target(size.width(), size.height(), 0,

gpu/vulkan/vulkan_image_android.cc

@@ -100,6 +100,11 @@ bool VulkanImage::InitializeFromGpuMemoryBufferHandle(
     return false;
   }
 
+  // Skia currently requires all wrapped VkImages to have transfer src and dst
+  // usage. Additionally all AHB support these usages when imported into vulkan.
+  usage_flags |=
+      VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+
   VkImageCreateFlags create_flags = 0;
   if (ahb_desc.usage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT) {
     create_flags = VK_IMAGE_CREATE_PROTECTED_BIT;

gpu/vulkan/vulkan_swap_chain.cc

@@ -234,6 +234,8 @@ bool VulkanSwapChain::InitializeSwapChain(
          base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()});
   }
 
+  image_usage_ = image_usage_flags;
+
   return true;
 }
 
@@ -290,6 +292,7 @@ void VulkanSwapChain::DestroySwapImages() {
 bool VulkanSwapChain::BeginWriteCurrentImage(VkImage* image,
                                              uint32_t* image_index,
                                              VkImageLayout* image_layout,
+                                             VkImageUsageFlags* image_usage,
                                              VkSemaphore* begin_semaphore,
                                              VkSemaphore* end_semaphore) {
   base::AutoLock auto_lock(lock_);
@@ -297,6 +300,7 @@ bool VulkanSwapChain::BeginWriteCurrentImage(VkImage* image,
   DCHECK(image);
   DCHECK(image_index);
   DCHECK(image_layout);
+  DCHECK(image_usage);
   DCHECK(begin_semaphore);
   DCHECK(end_semaphore);
   DCHECK(!is_writing_);
@@ -327,6 +331,7 @@ bool VulkanSwapChain::BeginWriteCurrentImage(VkImage* image,
   *image = current_image_data.image;
   *image_index = *acquired_image_;
   *image_layout = current_image_data.image_layout;
+  *image_usage = image_usage_;
   *begin_semaphore = current_image_data.acquire_semaphore;
   *end_semaphore = current_image_data.present_semaphore;
   is_writing_ = true;
@@ -568,7 +573,7 @@ void VulkanSwapChain::ReturnFenceAndSemaphores(
 VulkanSwapChain::ScopedWrite::ScopedWrite(VulkanSwapChain* swap_chain)
     : swap_chain_(swap_chain) {
   success_ = swap_chain_->BeginWriteCurrentImage(
-      &image_, &image_index_, &image_layout_, &begin_semaphore_,
+      &image_, &image_index_, &image_layout_, &image_usage_, &begin_semaphore_,
       &end_semaphore_);
   if (LIKELY(success_)) {
     DCHECK(begin_semaphore_ != VK_NULL_HANDLE);

gpu/vulkan/vulkan_swap_chain.h

@@ -42,6 +42,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanSwapChain {
     VkImage image() const { return image_; }
     uint32_t image_index() const { return image_index_; }
     VkImageLayout image_layout() const { return image_layout_; }
+    VkImageUsageFlags image_usage() const { return image_usage_; }
     VkSemaphore begin_semaphore() const { return begin_semaphore_; }
     VkSemaphore end_semaphore() const { return end_semaphore_; }
 
@@ -51,6 +52,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanSwapChain {
     VkImage image_ = VK_NULL_HANDLE;
     uint32_t image_index_ = 0;
     VkImageLayout image_layout_ = VK_IMAGE_LAYOUT_UNDEFINED;
+    VkImageUsageFlags image_usage_ = 0;
     VkSemaphore begin_semaphore_ = VK_NULL_HANDLE;
     VkSemaphore end_semaphore_ = VK_NULL_HANDLE;
 
@@ -134,6 +136,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanSwapChain {
   bool BeginWriteCurrentImage(VkImage* image,
                               uint32_t* image_index,
                               VkImageLayout* layout,
+                              VkImageUsageFlags* usage,
                               VkSemaphore* begin_semaphore,
                               VkSemaphore* end_semaphore);
   void EndWriteCurrentImage();
@@ -163,6 +166,8 @@ class COMPONENT_EXPORT(VULKAN) VulkanSwapChain {
   // Images in the swap chain.
   std::vector<ImageData> images_ GUARDED_BY(lock_);
 
+  VkImageUsageFlags image_usage_ = 0;
+
   // True if BeginWriteCurrentImage() is called, but EndWriteCurrentImage() is
   // not.
   bool is_writing_ GUARDED_BY(lock_) = false;

ui/ozone/platform/scenic/sysmem_buffer_collection.cc

@@ -441,7 +441,9 @@ void SysmemBufferCollection::InitializeImageCreateInfo(
   vk_image_info->tiling =
       is_mappable() ? VK_IMAGE_TILING_LINEAR : VK_IMAGE_TILING_OPTIMAL;
 
-  vk_image_info->usage = VK_IMAGE_USAGE_SAMPLED_BIT;
+  vk_image_info->usage = VK_IMAGE_USAGE_SAMPLED_BIT |
+                         VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
+                         VK_IMAGE_USAGE_TRANSFER_DST_BIT;
   if (usage_ == gfx::BufferUsage::SCANOUT ||
       usage_ == gfx::BufferUsage::SCANOUT_CPU_READ_WRITE) {
     vk_image_info->usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;