Render target wrapping

bdero · bdero · commit d108909ed45e · 2023-05-30T03:55:05.000-07:00
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -1481,6 +1481,8 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.h + ../../.
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.cc + ../../../flutter/LICENSE
@@ -2799,6 +2801,8 @@ ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl.cc + ../../
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_gl.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_software.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_software.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/embedder/embedder_surface_vulkan.cc + ../../../flutter/LICENSE
@@ -4138,6 +4142,8 @@ FILE: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/surface_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/texture_mtl.mm
+FILE: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.h
+FILE: ../../../flutter/impeller/renderer/backend/metal/texture_wrapper_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.cc
@@ -5472,6 +5478,8 @@ FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_gl.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal.mm
+FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.h
+FILE: ../../../flutter/shell/platform/embedder/embedder_surface_metal_impeller.mm
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_software.cc
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_software.h
 FILE: ../../../flutter/shell/platform/embedder/embedder_surface_vulkan.cc
diff --git a/flow/BUILD.gn b/flow/BUILD.gn
@@ -93,6 +93,7 @@ source_set("flow") {
     "//flutter/common",
     "//flutter/common/graphics",
     "//flutter/fml",
+    "//flutter/impeller/aiks:aiks",
     "//third_party/skia",
   ]
 
diff --git a/flow/embedded_views.cc b/flow/embedded_views.cc
@@ -42,8 +42,10 @@ bool DisplayListEmbedderViewSlice::recording_ended() {
   return builder_ == nullptr;
 }
 
-void ExternalViewEmbedder::SubmitFrame(GrDirectContext* context,
-                                       std::unique_ptr<SurfaceFrame> frame) {
+void ExternalViewEmbedder::SubmitFrame(
+    GrDirectContext* context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
+    std::unique_ptr<SurfaceFrame> frame) {
   frame->Submit();
 };
 
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
@@ -14,7 +14,7 @@
 #include "flutter/flow/surface_frame.h"
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/raster_thread_merger.h"
-#include "impeller/renderer/context.h"
+#include "impeller/aiks/aiks_context.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ -418,7 +418,7 @@ class ExternalViewEmbedder {
   // It can also allocate frames for overlay surfaces to compose hybrid views.
   virtual void SubmitFrame(
       GrDirectContext* context,
-      const std::shared_ptr<impeller::Context>& impeller_context,
+      const std::shared_ptr<impeller::AiksContext>& aiks_context,
       std::unique_ptr<SurfaceFrame> frame);
 
   // This method provides the embedder a way to do additional tasks after
diff --git a/impeller/renderer/backend/metal/BUILD.gn b/impeller/renderer/backend/metal/BUILD.gn
@@ -42,6 +42,8 @@ impeller_component("metal") {
     "surface_mtl.mm",
     "texture_mtl.h",
     "texture_mtl.mm",
+    "texture_wrapper_mtl.h",
+    "texture_wrapper_mtl.mm",
     "vertex_descriptor_mtl.h",
     "vertex_descriptor_mtl.mm",
   ]
diff --git a/impeller/renderer/backend/metal/texture_mtl.h b/impeller/renderer/backend/metal/texture_mtl.h
@@ -19,8 +19,10 @@ class TextureMTL final : public Texture,
              id<MTLTexture> texture,
              bool wrapped = false);
 
-  static std::shared_ptr<TextureMTL> Wrapper(TextureDescriptor desc,
-                                             id<MTLTexture> texture);
+  static std::shared_ptr<TextureMTL> Wrapper(
+      TextureDescriptor desc,
+      id<MTLTexture> texture,
+      std::function<void()> deletion_proc = nullptr);
 
   // |Texture|
   ~TextureMTL() override;
diff --git a/impeller/renderer/backend/metal/texture_mtl.mm b/impeller/renderer/backend/metal/texture_mtl.mm
@@ -9,6 +9,13 @@
 
 namespace impeller {
 
+std::shared_ptr<Texture> WrapperMTL(TextureDescriptor desc,
+                                    const void* mtl_texture,
+                                    std::function<void()> deletion_proc) {
+  return TextureMTL::Wrapper(desc, (__bridge id<MTLTexture>)mtl_texture,
+                             std::move(deletion_proc));
+}
+
 TextureMTL::TextureMTL(TextureDescriptor p_desc,
                        id<MTLTexture> texture,
                        bool wrapped)
@@ -28,9 +35,13 @@
   is_valid_ = true;
 }
 
-std::shared_ptr<TextureMTL> TextureMTL::Wrapper(TextureDescriptor desc,
-                                                id<MTLTexture> texture) {
-  return std::make_shared<TextureMTL>(desc, texture, true);
+std::shared_ptr<TextureMTL> TextureMTL::Wrapper(
+    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(); });
 }
 
 TextureMTL::~TextureMTL() = default;
diff --git a/impeller/renderer/backend/metal/texture_wrapper_mtl.h b/impeller/renderer/backend/metal/texture_wrapper_mtl.h
@@ -0,0 +1,16 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#pragma once
+
+#include "impeller/core/texture.h"
+
+namespace impeller {
+
+std::shared_ptr<Texture> WrapTextureMTL(
+    TextureDescriptor desc,
+    const void* mtl_texture,
+    std::function<void()> deletion_proc = nullptr);
+
+}  // namespace impeller
diff --git a/impeller/renderer/backend/metal/texture_wrapper_mtl.mm b/impeller/renderer/backend/metal/texture_wrapper_mtl.mm
@@ -0,0 +1,20 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/renderer/backend/metal/texture_wrapper_mtl.h"
+
+#include <Metal/Metal.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));
+}
+
+}  // namespace impeller
diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
@@ -315,6 +315,7 @@ if (enable_unittests) {
       ":shell_unittests_fixtures",
       "//flutter/assets",
       "//flutter/common/graphics",
+      "//flutter/impeller/aiks:aiks",
       "//flutter/shell/profiling:profiling_unittests",
       "//flutter/shell/version",
       "//flutter/testing:fixture_test",
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
@@ -633,11 +633,8 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
     if (external_view_embedder_ &&
         (!raster_thread_merger_ || raster_thread_merger_->IsMerged())) {
       FML_DCHECK(!frame->IsSubmitted());
-      auto aiks_context = surface_->GetAiksContext();
       external_view_embedder_->SubmitFrame(
-          surface_->GetContext(),
-          !!aiks_context ? aiks_context->GetContext() : nullptr,
-          std::move(frame));
+          surface_->GetContext(), surface_->GetAiksContext(), std::move(frame));
     } else {
       frame->Submit();
     }
diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc
@@ -14,7 +14,7 @@
 #include "flutter/fml/time/time_point.h"
 #include "flutter/shell/common/thread_host.h"
 #include "flutter/testing/testing.h"
-#include "impeller/renderer/context.h"
+#include "impeller/aiks/aiks_context.h"
 
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
@@ -76,7 +76,7 @@ class MockExternalViewEmbedder : public ExternalViewEmbedder {
   MOCK_METHOD1(CompositeEmbeddedView, DlCanvas*(int64_t view_id));
   MOCK_METHOD3(SubmitFrame,
                void(GrDirectContext* context,
-                    const std::shared_ptr<impeller::Context>& impeller_context,
+                    const std::shared_ptr<impeller::AiksContext>& aiks_context,
                     std::unique_ptr<SurfaceFrame> frame));
   MOCK_METHOD2(EndFrame,
                void(bool should_resubmit_frame,
diff --git a/shell/common/shell_test_external_view_embedder.cc b/shell/common/shell_test_external_view_embedder.cc
@@ -91,7 +91,7 @@ DlCanvas* ShellTestExternalViewEmbedder::CompositeEmbeddedView(
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::SubmitFrame(
     GrDirectContext* context,
-    const std::shared_ptr<impeller::Context>& impeller_context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<SurfaceFrame> frame) {
   if (!frame) {
     return;
diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.h
@@ -75,7 +75,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
 
   // |ExternalViewEmbedder|
   void SubmitFrame(GrDirectContext* context,
-                   const std::shared_ptr<impeller::Context>& impeller_context,
+                   const std::shared_ptr<impeller::AiksContext>& aiks_context,
                    std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc
@@ -64,7 +64,7 @@ SkRect AndroidExternalViewEmbedder::GetViewRect(int64_t view_id) const {
 // |ExternalViewEmbedder|
 void AndroidExternalViewEmbedder::SubmitFrame(
     GrDirectContext* context,
-    const std::shared_ptr<impeller::Context>& impeller_context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<SurfaceFrame> frame) {
   TRACE_EVENT0("flutter", "AndroidExternalViewEmbedder::SubmitFrame");
 
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h
@@ -46,7 +46,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
 
   // |ExternalViewEmbedder|
   void SubmitFrame(GrDirectContext* context,
-                   const std::shared_ptr<impeller::Context>& impeller_context,
+                   const std::shared_ptr<impeller::AiksContext>& aiks_context,
                    std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc b/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
@@ -313,7 +313,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
         },
         /*frame_size=*/SkISize::Make(800, 600));
 
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
     // Submits frame if no Android view in the current frame.
     EXPECT_TRUE(did_submit_frame);
     // Doesn't resubmit frame.
@@ -381,7 +381,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
         },
         /*frame_size=*/SkISize::Make(800, 600));
 
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
     // Doesn't submit frame if there aren't Android views in the previous frame.
     EXPECT_FALSE(did_submit_frame);
     // Resubmits frame.
@@ -446,7 +446,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
     // Submits frame if there are Android views in the previous frame.
     EXPECT_TRUE(did_submit_frame);
     // Doesn't resubmit frame.
@@ -553,7 +553,7 @@ TEST(AndroidExternalViewEmbedder, OverlayCoverTwoPlatformViews) {
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -656,7 +656,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -724,7 +724,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFramePlatformViewWithoutAnyOverlay) {
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -825,7 +825,7 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
 
     EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
     embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -912,7 +912,7 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
 
     EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
     embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -1023,7 +1023,7 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
       SkSurfaces::Null(1000, 1000), framebuffer_info,
       [](const SurfaceFrame& surface_frame, DlCanvas* canvas) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), nullptr, std::move(surface_frame));
 
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
 
diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.h b/shell/platform/darwin/ios/ios_external_view_embedder.h
@@ -51,7 +51,7 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder {
 
   // |ExternalViewEmbedder|
   void SubmitFrame(GrDirectContext* context,
-                   const std::shared_ptr<impeller::Context>& impeller_context,
+                   const std::shared_ptr<impeller::AiksContext>& aiks_context,
                    std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.mm b/shell/platform/darwin/ios/ios_external_view_embedder.mm
@@ -68,7 +68,7 @@
 // |ExternalViewEmbedder|
 void IOSExternalViewEmbedder::SubmitFrame(
     GrDirectContext* context,
-    const std::shared_ptr<impeller::Context>& impeller_context,
+    const std::shared_ptr<impeller::AiksContext>& aiks_context,
     std::unique_ptr<SurfaceFrame> frame) {
   TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::SubmitFrame");
   FML_CHECK(platform_views_controller_);
diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
@@ -91,6 +91,8 @@ template("embedder_source_set") {
       "vsync_waiter_embedder.h",
     ]
 
+    public_deps = [ ":embedder_headers" ]
+
     if (embedder_enable_gl) {
       sources += [
         "embedder_external_texture_gl.cc",
@@ -122,11 +124,15 @@ template("embedder_source_set") {
         "embedder_external_texture_metal.mm",
         "embedder_surface_metal.h",
         "embedder_surface_metal.mm",
+        "embedder_surface_metal_impeller.h",
+        "embedder_surface_metal_impeller.mm",
       ]
 
       cflags_objc = flutter_cflags_objc
       cflags_objcc = flutter_cflags_objcc
 
+      public_deps += [ "//flutter/impeller/renderer/backend/metal" ]
+
       deps += [ "//flutter/shell/platform/darwin/graphics" ]
     }
 
@@ -142,8 +148,6 @@ template("embedder_source_set") {
       ]
     }
 
-    public_deps = [ ":embedder_headers" ]
-
     public_configs += [
       ":embedder_gpu_configuration_config",
       ":embedder_header_config",
diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
diff --git a/shell/platform/embedder/embedder_external_view.cc b/shell/platform/embedder/embedder_external_view.cc
diff --git a/shell/platform/embedder/embedder_external_view_embedder.cc b/shell/platform/embedder/embedder_external_view_embedder.cc
diff --git a/shell/platform/embedder/embedder_external_view_embedder.h b/shell/platform/embedder/embedder_external_view_embedder.h
diff --git a/shell/platform/embedder/embedder_render_target.cc b/shell/platform/embedder/embedder_render_target.cc
diff --git a/shell/platform/embedder/embedder_render_target.h b/shell/platform/embedder/embedder_render_target.h
diff --git a/shell/platform/embedder/embedder_render_target_cache.cc b/shell/platform/embedder/embedder_render_target_cache.cc
diff --git a/shell/platform/embedder/embedder_surface_metal_impeller.h b/shell/platform/embedder/embedder_surface_metal_impeller.h
diff --git a/shell/platform/embedder/embedder_surface_metal_impeller.mm b/shell/platform/embedder/embedder_surface_metal_impeller.mm

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ source_set("flow") {`
`93`	`93`	`"//flutter/common",`
`94`	`94`	`"//flutter/common/graphics",`
`95`	`95`	`"//flutter/fml",`
	`96`	`+ "//flutter/impeller/aiks:aiks",`
`96`	`97`	`"//third_party/skia",`
`97`	`98`	`]`
`98`	`99`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ impeller_component("metal") {`
`42`	`42`	`"surface_mtl.mm",`
`43`	`43`	`"texture_mtl.h",`
`44`	`44`	`"texture_mtl.mm",`
	`45`	`+ "texture_wrapper_mtl.h",`
	`46`	`+ "texture_wrapper_mtl.mm",`
`45`	`47`	`"vertex_descriptor_mtl.h",`
`46`	`48`	`"vertex_descriptor_mtl.mm",`
`47`	`49`	`]`