It's alive!

Author: bdero

impeller/renderer/backend/metal/texture_mtl.mm

@@ -39,9 +39,14 @@
     TextureDescriptor desc,
     id<MTLTexture> texture,
     std::function<void()> deletion_proc) {
-  return std::shared_ptr<TextureMTL>(new TextureMTL(desc, texture, true),
-                                     [deletion_proc = std::move(deletion_proc)](
-                                         TextureMTL* t) { deletion_proc(); });
+  if (deletion_proc) {
+    return std::shared_ptr<TextureMTL>(
+        new TextureMTL(desc, texture, true),
+        [deletion_proc = std::move(deletion_proc)](TextureMTL* t) {
+          deletion_proc();
+        });
+  }
+  return std::shared_ptr<TextureMTL>(new TextureMTL(desc, texture, true));
 }
 
 TextureMTL::~TextureMTL() = default;

impeller/renderer/backend/metal/texture_wrapper_mtl.mm

@@ -6,15 +6,17 @@
 
 #include <Metal/Metal.h>
 
+#include "impeller/renderer/backend/metal/formats_mtl.h"
 #include "impeller/renderer/backend/metal/texture_mtl.h"
 
 namespace impeller {
 
 std::shared_ptr<Texture> WrapTextureMTL(TextureDescriptor desc,
                                         const void* mtl_texture,
                                         std::function<void()> deletion_proc) {
-  return TextureMTL::Wrapper(desc, (__bridge id<MTLTexture>)mtl_texture,
-                             std::move(deletion_proc));
+  auto texture = (__bridge id<MTLTexture>)mtl_texture;
+  desc.format = FromMTLPixelFormat(texture.pixelFormat);
+  return TextureMTL::Wrapper(desc, texture, std::move(deletion_proc));
 }
 
 }  // namespace impeller

shell/platform/embedder/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/toolchain/clang.gni")
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
+import("//flutter/impeller/tools/impeller.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/shell/platform/embedder/embedder.gni")
 import("//flutter/testing/testing.gni")
@@ -150,6 +151,7 @@ template("embedder_source_set") {
 
     public_configs += [
       ":embedder_gpu_configuration_config",
+      "//flutter/impeller:impeller_public_config",
       ":embedder_header_config",
       "//flutter:config",
     ]

shell/platform/embedder/embedder.cc

@@ -928,46 +928,43 @@ MakeImpellerSurfaceFromBackingStore(
   }
 
   const auto size = impeller::ISize(config.size.width, config.size.height);
-  const auto color_format = impeller::PixelFormat::kR8G8B8A8UNormInt;
-
-  impeller::TextureDescriptor msaa_tex_desc;
-  msaa_tex_desc.storage_mode = impeller::StorageMode::kDeviceTransient;
-  msaa_tex_desc.type = impeller::TextureType::kTexture2DMultisample;
-  msaa_tex_desc.sample_count = impeller::SampleCount::kCount4;
-  msaa_tex_desc.format = color_format;
-  msaa_tex_desc.size = size;
-  msaa_tex_desc.usage =
-      static_cast<uint64_t>(impeller::TextureUsage::kRenderTarget);
-
-  auto msaa_tex =
-      aiks_context->GetContext()->GetResourceAllocator()->CreateTexture(
-          msaa_tex_desc);
-  if (!msaa_tex) {
-    FML_LOG(ERROR) << "Could not allocate MSAA color texture.";
-    return std::nullopt;
-  }
-  msaa_tex->SetLabel("ImpellerBackingStoreColorMSAA");
 
   impeller::TextureDescriptor resolve_tex_desc;
   resolve_tex_desc.size = size;
-  resolve_tex_desc.format = color_format;
-  resolve_tex_desc.mip_count = 0;
   resolve_tex_desc.sample_count = impeller::SampleCount::kCount1;
   resolve_tex_desc.storage_mode = impeller::StorageMode::kDevicePrivate;
   resolve_tex_desc.usage =
       static_cast<uint64_t>(impeller::TextureUsage::kRenderTarget) |
       static_cast<uint64_t>(impeller::TextureUsage::kShaderRead);
+
   auto resolve_tex = impeller::WrapTextureMTL(
       resolve_tex_desc, metal->texture.texture,
       [callback = metal->texture.destruction_callback,
        user_data = metal->texture.user_data]() { callback(user_data); });
-
   if (!resolve_tex) {
     FML_LOG(ERROR) << "Could not wrap embedder supplied Metal render texture.";
     return std::nullopt;
   }
   resolve_tex->SetLabel("ImpellerBackingStoreResolve");
 
+  impeller::TextureDescriptor msaa_tex_desc;
+  msaa_tex_desc.storage_mode = impeller::StorageMode::kDeviceTransient;
+  msaa_tex_desc.type = impeller::TextureType::kTexture2DMultisample;
+  msaa_tex_desc.sample_count = impeller::SampleCount::kCount4;
+  msaa_tex_desc.format = resolve_tex->GetTextureDescriptor().format;
+  msaa_tex_desc.size = size;
+  msaa_tex_desc.usage =
+      static_cast<uint64_t>(impeller::TextureUsage::kRenderTarget);
+
+  auto msaa_tex =
+      aiks_context->GetContext()->GetResourceAllocator()->CreateTexture(
+          msaa_tex_desc);
+  if (!msaa_tex) {
+    FML_LOG(ERROR) << "Could not allocate MSAA color texture.";
+    return std::nullopt;
+  }
+  msaa_tex->SetLabel("ImpellerBackingStoreColorMSAA");
+
   impeller::ColorAttachment color0;
   color0.texture = msaa_tex;
   color0.clear_color = impeller::Color::DarkSlateGray();

shell/platform/embedder/embedder_external_view.cc

@@ -95,8 +95,8 @@ bool EmbedderExternalView::Render(const EmbedderRenderTarget& render_target) {
 
     auto dispatcher = impeller::DlDispatcher();
     dispatcher.drawDisplayList(dl_builder.Build(), 1);
-    aiks_context->Render(dispatcher.EndRecordingAsPicture(), *impeller_target);
-    return true;
+    return aiks_context->Render(dispatcher.EndRecordingAsPicture(),
+                                *impeller_target);
   }
 
   auto skia_surface = render_target.GetRenderSurface();