Fix render texture issue

Author: xiaowei-guan

engine/src/flutter/shell/platform/embedder/embedder_external_texture_source_vulkan.cc

@@ -12,6 +12,21 @@
 
 namespace flutter {
 
+bool RequiresYCBCRConversion(impeller::vk::Format format) {
+  switch (format) {
+    case impeller::vk::Format::eG8B8R83Plane420Unorm:
+    case impeller::vk::Format::eG8B8R82Plane420Unorm:
+    case impeller::vk::Format::eG8B8R83Plane422Unorm:
+    case impeller::vk::Format::eG8B8R82Plane422Unorm:
+    case impeller::vk::Format::eG8B8R83Plane444Unorm:
+      return true;
+    default:
+      // NOTE: NOT EXHAUSTIVE.
+      break;
+  }
+  return false;
+}
+
 EmbedderExternalTextureSourceVulkan::EmbedderExternalTextureSourceVulkan(
     const std::shared_ptr<impeller::Context>& p_context,
     FlutterVulkanTexture* embedder_desc)
@@ -22,15 +37,21 @@ EmbedderExternalTextureSourceVulkan::EmbedderExternalTextureSourceVulkan(
       impeller::vk::Image(reinterpret_cast<VkImage>(embedder_desc->image));
   texture_device_memory_ = impeller::vk::DeviceMemory(
       reinterpret_cast<VkDeviceMemory>(embedder_desc->image_memory));
-  // Figure out how to perform YUV conversions.
-  auto yuv_conversion = CreateYUVConversion(context, embedder_desc);
-  if (!yuv_conversion || !yuv_conversion->IsValid()) {
-    VALIDATION_LOG << "Fail to create yuv conversion";
-    return;
+
+  needs_yuv_conversion_ = RequiresYCBCRConversion(
+      static_cast<impeller::vk::Format>(embedder_desc->format));
+  std::shared_ptr<impeller::YUVConversionVK> yuv_conversion;
+  if (needs_yuv_conversion_) {
+    // Figure out how to perform YUV conversions.
+    yuv_conversion = CreateYUVConversion(context, embedder_desc);
+    if (!yuv_conversion || !yuv_conversion->IsValid()) {
+      VALIDATION_LOG << "Fail to create yuv conversion";
+      return;
+    }
   }
 
   // Create image view for the newly created image.
-  if (!CreateTextureImageView(device)) {
+  if (!CreateTextureImageView(device, embedder_desc, yuv_conversion)) {
     VALIDATION_LOG << "Fail to create texture image view";
     return;
   }
@@ -111,24 +132,32 @@ EmbedderExternalTextureSourceVulkan::CreateYUVConversion(
 }
 
 bool EmbedderExternalTextureSourceVulkan::CreateTextureImageView(
-    const impeller::vk::Device& device) {
+    const impeller::vk::Device& device,
+    FlutterVulkanTexture* embedder_desc,
+    const std::shared_ptr<impeller::YUVConversionVK>& yuv_conversion_wrapper) {
   impeller::vk::StructureChain<impeller::vk::ImageViewCreateInfo,
                                impeller::vk::SamplerYcbcrConversionInfo>
       view_chain;
   auto& view_info = view_chain.get();
   view_info.image = texture_image_;
   view_info.viewType = impeller::vk::ImageViewType::e2D;
-  view_info.format = impeller::vk::Format::eR8G8B8A8Srgb;
+  view_info.format = static_cast<impeller::vk::Format>(embedder_desc->format);
   view_info.subresourceRange.aspectMask =
       impeller::vk::ImageAspectFlagBits::eColor;
   view_info.subresourceRange.baseMipLevel = 0u;
   view_info.subresourceRange.baseArrayLayer = 0u;
   view_info.subresourceRange.levelCount = 1;
   view_info.subresourceRange.layerCount = 1;
+
+  if (RequiresYCBCRConversion(
+          static_cast<impeller::vk::Format>(embedder_desc->format))) {
+    view_chain.get<impeller::vk::SamplerYcbcrConversionInfo>().conversion =
+        yuv_conversion_wrapper->GetConversion();
+  } else {
+    view_chain.unlink<impeller::vk::SamplerYcbcrConversionInfo>();
+  }
   auto image_view = device.createImageViewUnique(view_info);
   if (image_view.result != impeller::vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create external image view: "
-                   << impeller::vk::to_string(image_view.result);
     return false;
   }
   texture_image_view_ = std::move(image_view.value);

engine/src/flutter/shell/platform/embedder/embedder_external_texture_source_vulkan.h

@@ -43,7 +43,10 @@ class EmbedderExternalTextureSourceVulkan final
   std::shared_ptr<impeller::YUVConversionVK> GetYUVConversion() const override;
 
  private:
-  bool CreateTextureImageView(const impeller::vk::Device& device);
+  bool CreateTextureImageView(
+      const impeller::vk::Device& device,
+      FlutterVulkanTexture* embedder_desc,
+      const std::shared_ptr<impeller::YUVConversionVK>& yuv_conversion_wrapper);
   impeller::TextureDescriptor ToTextureDescriptor(
       FlutterVulkanTexture* embedder_desc);
   std::shared_ptr<impeller::YUVConversionVK> CreateYUVConversion(

engine/src/flutter/shell/platform/embedder/embedder_external_texture_vulkan.cc

@@ -124,15 +124,14 @@ sk_sp<DlImage> EmbedderExternalTextureVulkan::ResolveTextureSkia(
 
   GrVkImageInfo image_info = {};
   if (IsYUVVkFormat(static_cast<VkFormat>(texture->format))) {
-    FML_LOG(ERROR) << "try to create YUV image-002.....";
     skgpu::VulkanYcbcrConversionInfo ycbcr_info = {
         static_cast<VkFormat>(texture->format),
         0,
         VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709,
-        VK_SAMPLER_YCBCR_RANGE_ITU_NARROW,
+        VK_SAMPLER_YCBCR_RANGE_ITU_FULL,
         VK_CHROMA_LOCATION_COSITED_EVEN,
         VK_CHROMA_LOCATION_COSITED_EVEN,
-        VK_FILTER_LINEAR,
+        VK_FILTER_NEAREST,
         false,
         static_cast<VkFormatFeatureFlags>(texture->format_features)};
 
@@ -144,10 +143,9 @@ sk_sp<DlImage> EmbedderExternalTextureVulkan::ResolveTextureSkia(
     image_info = {.fImage = reinterpret_cast<VkImage>(texture->image),
                   .fAlloc = alloc,
                   .fImageTiling = VK_IMAGE_TILING_LINEAR,
-                  .fImageLayout = VK_IMAGE_LAYOUT_UNDEFINED,
+                  .fImageLayout = VK_IMAGE_LAYOUT_PREINITIALIZED,
                   .fFormat = static_cast<VkFormat>(texture->format),
-                  .fImageUsageFlags = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
-                                      VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
+                  .fImageUsageFlags = VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
                                       VK_IMAGE_USAGE_TRANSFER_DST_BIT |
                                       VK_IMAGE_USAGE_SAMPLED_BIT,
                   .fSampleCount = 1,
@@ -170,9 +168,6 @@ sk_sp<DlImage> EmbedderExternalTextureVulkan::ResolveTextureSkia(
 
   auto gr_backend_texture =
       GrBackendTextures::MakeVk(width, height, image_info);
-  FML_LOG(ERROR) << "backend texture isValid : "
-                 << gr_backend_texture.isValid();
-  // FML_LOG(ERROR) << "backend texture isValid : " << gr_backend_texture.;
   SkImages::TextureReleaseProc release_proc = texture->destruction_callback;
   auto image =
       SkImages::BorrowTextureFrom(context,                   // context
@@ -191,7 +186,6 @@ sk_sp<DlImage> EmbedderExternalTextureVulkan::ResolveTextureSkia(
     if (release_proc) {
       release_proc(texture->user_data);
     }
-    FML_LOG(ERROR) << "Could not create external texture.....";
     return nullptr;
   }