Add dl vertices object (flutter#32329)

DEPS

@@ -116,7 +116,7 @@ deps = {
   'src': 'https://github.com/flutter/buildroot.git' + '@' + '9b3955d9ad8621dbf961044dc28d8b12804abb58',
 
   'src/flutter/impeller':
-  Var('github_git') + '/flutter/impeller' + '@' + '1e4f9e421c7d77d64d2bbe472d23eec3939f7ebb',
+   Var('github_git') + '/flutter/impeller' + '@' + '2adc41bb87acffab0bca6bcdb9bc8da330068cc9',
 
    # Fuchsia compatibility
    #

ci/licenses_golden/licenses_flutter

@@ -94,6 +94,9 @@ FILE: ../../../flutter/display_list/display_list_tile_mode.h
 FILE: ../../../flutter/display_list/display_list_unittests.cc
 FILE: ../../../flutter/display_list/display_list_utils.cc
 FILE: ../../../flutter/display_list/display_list_utils.h
+FILE: ../../../flutter/display_list/display_list_vertices.cc
+FILE: ../../../flutter/display_list/display_list_vertices.h
+FILE: ../../../flutter/display_list/display_list_vertices_unittests.cc
 FILE: ../../../flutter/display_list/types.h
 FILE: ../../../flutter/flow/compositor_context.cc
 FILE: ../../../flutter/flow/compositor_context.h
@@ -458,10 +461,14 @@ FILE: ../../../flutter/impeller/entity/contents/filters/blend_filter_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/blend_filter_contents.h
 FILE: ../../../flutter/impeller/entity/contents/filters/filter_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/filter_contents.h
+FILE: ../../../flutter/impeller/entity/contents/filters/filter_input.cc
+FILE: ../../../flutter/impeller/entity/contents/filters/filter_input.h
 FILE: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
 FILE: ../../../flutter/impeller/entity/contents/linear_gradient_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/linear_gradient_contents.h
+FILE: ../../../flutter/impeller/entity/contents/snapshot.cc
+FILE: ../../../flutter/impeller/entity/contents/snapshot.h
 FILE: ../../../flutter/impeller/entity/contents/solid_color_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/solid_color_contents.h
 FILE: ../../../flutter/impeller/entity/contents/solid_stroke_contents.cc

display_list/BUILD.gn

@@ -44,6 +44,8 @@ source_set("display_list") {
     "display_list_tile_mode.h",
     "display_list_utils.cc",
     "display_list_utils.h",
+    "display_list_vertices.cc",
+    "display_list_vertices.h",
     "types.h",
   ]
 
@@ -70,6 +72,7 @@ source_set("unittests") {
     "display_list_test_utils.cc",
     "display_list_test_utils.h",
     "display_list_unittests.cc",
+    "display_list_vertices_unittests.cc",
   ]
 
   deps = [

display_list/display_list.h

@@ -131,6 +131,7 @@ namespace flutter {
   V(DrawLines)                      \
   V(DrawPolygon)                    \
   V(DrawVertices)                   \
+  V(DrawSkVertices)                 \
                                     \
   V(DrawImage)                      \
   V(DrawImageWithAttr)              \

display_list/display_list_attributes_testing.h

@@ -21,7 +21,7 @@ static void TestEquals(T& source1, T& source2) {
   ASSERT_EQ(source1, source2);
   ASSERT_EQ(source2, source1);
   ASSERT_TRUE(Equals(&source1, &source2));
-  ASSERT_TRUE(Equals(source1.shared(), source2.shared()));
+  ASSERT_TRUE(Equals(&source2, &source1));
 }
 
 template <class T>
@@ -33,7 +33,7 @@ static void TestNotEquals(T& source1, T& source2, std::string label) {
   ASSERT_NE(source1, source2) << label;
   ASSERT_NE(source2, source1) << label;
   ASSERT_TRUE(NotEquals(&source1, &source2));
-  ASSERT_TRUE(NotEquals(source1.shared(), source2.shared()));
+  ASSERT_TRUE(NotEquals(&source2, &source1));
 }
 
 }  // namespace testing

display_list/display_list_benchmarks.cc

@@ -688,11 +688,11 @@ void BM_DrawPath(benchmark::State& state,
 // and the final vertex being the center point of the disc.
 //
 // Each vertex colour will alternate through Red, Green, Blue and Cyan.
-sk_sp<SkVertices> GetTestVertices(SkPoint center,
-                                  float radius,
-                                  size_t vertex_count,
-                                  SkVertices::VertexMode mode,
-                                  size_t& final_vertex_count) {
+std::shared_ptr<DlVertices> GetTestVertices(SkPoint center,
+                                            float radius,
+                                            size_t vertex_count,
+                                            DlVertexMode mode,
+                                            size_t& final_vertex_count) {
   size_t outer_vertex_count = vertex_count / 2;
   std::vector<SkPoint> outer_points =
       GetPolygonPoints(outer_vertex_count, center, radius);
@@ -701,7 +701,7 @@ sk_sp<SkVertices> GetTestVertices(SkPoint center,
   std::vector<SkColor> colors;
 
   switch (mode) {
-    case SkVertices::VertexMode::kTriangleFan_VertexMode:
+    case DlVertexMode::kTriangleFan:
       // Calling the points on the outer circle O_0, O_1, O_2, ..., and
       // the center point C, this should create a triangle fan with vertices
       // C, O_0, O_1, O_2, O_3, ...
@@ -718,7 +718,7 @@ sk_sp<SkVertices> GetTestVertices(SkPoint center,
         }
       }
       break;
-    case SkVertices::VertexMode::kTriangles_VertexMode:
+    case DlVertexMode::kTriangles:
       // Calling the points on the outer circle O_0, O_1, O_2, ..., and
       // the center point C, this should create a series of triangles with
       // vertices O_0, O_1, C, O_1, O_2, C, O_2, O_3, C, ...
@@ -731,7 +731,7 @@ sk_sp<SkVertices> GetTestVertices(SkPoint center,
         colors.push_back(SK_ColorBLUE);
       }
       break;
-    case SkVertices::VertexMode::kTriangleStrip_VertexMode:
+    case DlVertexMode::kTriangleStrip:
       // Calling the points on the outer circle O_0, O_1, O_2, ..., and
       // the center point C, this should create a strip with vertices
       // O_0, O_1, C, O_2, O_3, C, O_4, O_5, C, ...
@@ -749,17 +749,17 @@ sk_sp<SkVertices> GetTestVertices(SkPoint center,
   }
 
   final_vertex_count = vertices.size();
-  return SkVertices::MakeCopy(mode, vertices.size(), vertices.data(), nullptr,
-                              colors.data());
+  return DlVertices::Make(mode, vertices.size(), vertices.data(), nullptr,
+                          colors.data());
 }
 
-std::string VertexModeToString(SkVertices::VertexMode mode) {
+std::string VertexModeToString(DlVertexMode mode) {
   switch (mode) {
-    case SkVertices::VertexMode::kTriangleStrip_VertexMode:
+    case DlVertexMode::kTriangleStrip:
       return "TriangleStrip";
-    case SkVertices::VertexMode::kTriangleFan_VertexMode:
+    case DlVertexMode::kTriangleFan:
       return "TriangleFan";
-    case SkVertices::VertexMode::kTriangles_VertexMode:
+    case DlVertexMode::kTriangles:
       return "Triangles";
   }
   return "Unknown";
@@ -776,7 +776,7 @@ std::string VertexModeToString(SkVertices::VertexMode mode) {
 void BM_DrawVertices(benchmark::State& state,
                      BackendType backend_type,
                      unsigned attributes,
-                     SkVertices::VertexMode mode) {
+                     DlVertexMode mode) {
   auto canvas_provider = CreateCanvasProvider(backend_type);
   DisplayListBuilder builder;
   builder.setAttributesFromPaint(GetPaintForRun(attributes),
@@ -799,7 +799,7 @@ void BM_DrawVertices(benchmark::State& state,
 
   state.counters["DrawCallCount"] = center_points.size();
   for (SkPoint p : center_points) {
-    sk_sp<SkVertices> vertices =
+    std::shared_ptr<DlVertices> vertices =
         GetTestVertices(p, radius, 50, mode, vertex_count);
     total_vertex_count += vertex_count;
     builder.drawVertices(vertices, DlBlendMode::kSrc);

display_list/display_list_benchmarks.h

@@ -6,6 +6,7 @@
 #define FLUTTER_FLOW_DISPLAY_LIST_BENCHMARKS_H_
 
 #include "flutter/display_list/display_list_benchmarks_canvas_provider.h"
+#include "flutter/display_list/display_list_vertices.h"
 
 #include "third_party/benchmark/include/benchmark/benchmark.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -76,7 +77,7 @@ void BM_DrawPoints(benchmark::State& state,
 void BM_DrawVertices(benchmark::State& state,
                      BackendType backend_type,
                      unsigned attributes,
-                     SkVertices::VertexMode mode);
+                     DlVertexMode mode);
 void BM_DrawImage(benchmark::State& state,
                   BackendType backend_type,
                   unsigned attributes,
@@ -238,7 +239,7 @@ void BM_SaveLayer(benchmark::State& state,
                     TriangleStrip/BACKEND,                              \
                     BackendType::k##BACKEND##_Backend,                  \
                     ATTRIBUTES,                                         \
-                    SkVertices::VertexMode::kTriangleStrip_VertexMode)  \
+                    DlVertexMode::kTriangleStrip)                       \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
       ->UseRealTime()                                                   \
@@ -249,7 +250,7 @@ void BM_SaveLayer(benchmark::State& state,
                     TriangleFan/BACKEND,                                \
                     BackendType::k##BACKEND##_Backend,                  \
                     ATTRIBUTES,                                         \
-                    SkVertices::VertexMode::kTriangleFan_VertexMode)    \
+                    DlVertexMode::kTriangleFan)                         \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
       ->UseRealTime()                                                   \
@@ -260,7 +261,7 @@ void BM_SaveLayer(benchmark::State& state,
                     Triangles/BACKEND,                                  \
                     BackendType::k##BACKEND##_Backend,                  \
                     ATTRIBUTES,                                         \
-                    SkVertices::VertexMode::kTriangles_VertexMode)      \
+                    DlVertexMode::kTriangles)                           \
       ->RangeMultiplier(2)                                              \
       ->Range(16, 2048)                                                 \
       ->UseRealTime()                                                   \

display_list/display_list_builder.cc

@@ -587,9 +587,19 @@ void DisplayListBuilder::drawPoints(SkCanvas::PointMode mode,
   // See: https://fiddle.skia.org/c/228459001d2de8db117ce25ef5cedb0c
   UpdateLayerOpacityCompatibility(false);
 }
-void DisplayListBuilder::drawVertices(const sk_sp<SkVertices> vertices,
+void DisplayListBuilder::drawSkVertices(const sk_sp<SkVertices> vertices,
+                                        SkBlendMode mode) {
+  Push<DrawSkVerticesOp>(0, 1, std::move(vertices), mode);
+  // DrawVertices applies its colors to the paint so we have no way
+  // of controlling opacity using the current paint attributes.
+  // Although, examination of the |mode| might find some predictable
+  // cases.
+  UpdateLayerOpacityCompatibility(false);
+}
+void DisplayListBuilder::drawVertices(const DlVertices* vertices,
                                       DlBlendMode mode) {
-  Push<DrawVerticesOp>(0, 1, std::move(vertices), mode);
+  void* pod = Push<DrawVerticesOp>(vertices->size(), 1, mode);
+  new (pod) DlVertices(vertices);
   // DrawVertices applies its colors to the paint so we have no way
   // of controlling opacity using the current paint attributes.
   // Although, examination of the |mode| might find some predictable

display_list/display_list_builder.h

@@ -203,8 +203,13 @@ class DisplayListBuilder final : public virtual Dispatcher,
   void drawPoints(SkCanvas::PointMode mode,
                   uint32_t count,
                   const SkPoint pts[]) override;
-  void drawVertices(const sk_sp<SkVertices> vertices,
-                    DlBlendMode mode) override;
+  void drawSkVertices(const sk_sp<SkVertices> vertices,
+                      SkBlendMode mode) override;
+  void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
+  void drawVertices(const std::shared_ptr<const DlVertices> vertices,
+                    DlBlendMode mode) {
+    drawVertices(vertices.get(), mode);
+  }
   void drawImage(const sk_sp<DlImage> image,
                  const SkPoint point,
                  const SkSamplingOptions& sampling,

display_list/display_list_canvas_dispatcher.cc

@@ -173,9 +173,14 @@ void DisplayListCanvasDispatcher::drawPoints(SkCanvas::PointMode mode,
                                              const SkPoint pts[]) {
   canvas_->drawPoints(mode, count, pts, paint());
 }
-void DisplayListCanvasDispatcher::drawVertices(const sk_sp<SkVertices> vertices,
+void DisplayListCanvasDispatcher::drawSkVertices(
+    const sk_sp<SkVertices> vertices,
+    SkBlendMode mode) {
+  canvas_->drawVertices(vertices, mode, paint());
+}
+void DisplayListCanvasDispatcher::drawVertices(const DlVertices* vertices,
                                                DlBlendMode mode) {
-  canvas_->drawVertices(vertices, ToSk(mode), paint());
+  canvas_->drawVertices(vertices->skia_object(), ToSk(mode), paint());
 }
 void DisplayListCanvasDispatcher::drawImage(const sk_sp<DlImage> image,
                                             const SkPoint point,

display_list/display_list_canvas_dispatcher.h

@@ -69,8 +69,9 @@ class DisplayListCanvasDispatcher : public virtual Dispatcher,
   void drawPoints(SkCanvas::PointMode mode,
                   uint32_t count,
                   const SkPoint pts[]) override;
-  void drawVertices(const sk_sp<SkVertices> vertices,
-                    DlBlendMode mode) override;
+  void drawSkVertices(const sk_sp<SkVertices> vertices,
+                      SkBlendMode mode) override;
+  void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
   void drawImage(const sk_sp<DlImage> image,
                  const SkPoint point,
                  const SkSamplingOptions& sampling,

display_list/display_list_canvas_recorder.cc

@@ -148,7 +148,7 @@ void DisplayListCanvasRecorder::onDrawVerticesObject(const SkVertices* vertices,
                                                      SkBlendMode mode,
                                                      const SkPaint& paint) {
   builder_->setAttributesFromPaint(paint, kDrawVerticesFlags);
-  builder_->drawVertices(sk_ref_sp(vertices), ToDl(mode));
+  builder_->drawSkVertices(sk_ref_sp(vertices), mode);
 }
 
 void DisplayListCanvasRecorder::onDrawImage2(const SkImage* image,

display_list/display_list_canvas_unittests.cc

@@ -2487,20 +2487,20 @@ TEST_F(DisplayListCanvas, DrawVerticesWithColors) {
       SK_ColorRED,  SK_ColorBLUE,   SK_ColorGREEN,
       SK_ColorCYAN, SK_ColorYELLOW, SK_ColorMAGENTA,
   };
-  const sk_sp<SkVertices> vertices = SkVertices::MakeCopy(
-      SkVertices::kTriangles_VertexMode, 6, pts, nullptr, colors);
+  const std::shared_ptr<DlVertices> vertices =
+      DlVertices::Make(DlVertexMode::kTriangles, 6, pts, nullptr, colors);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
           [=](SkCanvas* canvas, const SkPaint& paint) {  //
-            canvas->drawVertices(vertices.get(), SkBlendMode::kSrcOver, paint);
+            canvas->drawVertices(vertices->skia_object(), SkBlendMode::kSrcOver,
+                                 paint);
           },
           [=](DisplayListBuilder& builder) {  //
             builder.drawVertices(vertices, DlBlendMode::kSrcOver);
           },
           kDrawVerticesFlags)
           .set_draw_vertices());
-  EXPECT_TRUE(vertices->unique());
 }
 
 TEST_F(DisplayListCanvas, DrawVerticesWithImage) {
@@ -2531,8 +2531,8 @@ TEST_F(DisplayListCanvas, DrawVerticesWithImage) {
       SkPoint::Make(0, 0),
       SkPoint::Make(RenderWidth, 0),
   };
-  const sk_sp<SkVertices> vertices = SkVertices::MakeCopy(
-      SkVertices::kTriangles_VertexMode, 6, pts, tex, nullptr);
+  const std::shared_ptr<DlVertices> vertices =
+      DlVertices::Make(DlVertexMode::kTriangles, 6, pts, tex, nullptr);
 
   CanvasCompareTester::RenderAll(  //
       TestParameters(
@@ -2542,7 +2542,7 @@ TEST_F(DisplayListCanvas, DrawVerticesWithImage) {
               v_paint.setShader(
                   CanvasCompareTester::testImageColorSource.skia_object());
             }
-            canvas->drawVertices(vertices.get(), SkBlendMode::kSrcOver,
+            canvas->drawVertices(vertices->skia_object(), SkBlendMode::kSrcOver,
                                  v_paint);
           },
           [=](DisplayListBuilder& builder) {  //
@@ -2554,8 +2554,6 @@ TEST_F(DisplayListCanvas, DrawVerticesWithImage) {
           },
           kDrawVerticesFlags)
           .set_draw_vertices());
-
-  EXPECT_TRUE(vertices->unique());
 }
 
 TEST_F(DisplayListCanvas, DrawImageNearest) {

display_list/display_list_complexity_gl.cc

@@ -476,9 +476,9 @@ void DisplayListGLComplexityCalculator::GLHelper::drawPoints(
   AccumulateComplexity(complexity);
 }
 
-void DisplayListGLComplexityCalculator::GLHelper::drawVertices(
+void DisplayListGLComplexityCalculator::GLHelper::drawSkVertices(
     const sk_sp<SkVertices> vertices,
-    DlBlendMode mode) {
+    SkBlendMode mode) {
   // There is currently no way for us to get the VertexMode from the SkVertices
   // object, but for future reference:
   //
@@ -504,6 +504,25 @@ void DisplayListGLComplexityCalculator::GLHelper::drawVertices(
   AccumulateComplexity(complexity);
 }
 
+void DisplayListGLComplexityCalculator::GLHelper::drawVertices(
+    const DlVertices* vertices,
+    DlBlendMode mode) {
+  // There is currently no way for us to get the VertexMode from the SkVertices
+  // object, but for future reference:
+  //
+  // TriangleStrip is roughly 25% more expensive than TriangleFan.
+  // TriangleFan is roughly 5% more expensive than Triangles.
+
+  // For the baseline, it's hard to identify the trend. It might be O(n^1/2)
+  // For now, treat it as linear as an approximation.
+  //
+  // m = 1/1600
+  // c = 1
+  unsigned int complexity = (vertices->vertex_count() + 1600) * 250 / 2;
+
+  AccumulateComplexity(complexity);
+}
+
 void DisplayListGLComplexityCalculator::GLHelper::drawImage(
     const sk_sp<DlImage> image,
     const SkPoint point,

display_list/display_list_complexity_gl.h

@@ -54,8 +54,8 @@ class DisplayListGLComplexityCalculator
     void drawPoints(SkCanvas::PointMode mode,
                     uint32_t count,
                     const SkPoint points[]) override;
-    void drawVertices(const sk_sp<SkVertices> vertices,
-                      DlBlendMode mode) override;
+    void drawSkVertices(const sk_sp<SkVertices>, SkBlendMode mode) override;
+    void drawVertices(const DlVertices* vertices, DlBlendMode mode) override;
     void drawImage(const sk_sp<DlImage> image,
                    const SkPoint point,
                    const SkSamplingOptions& sampling,