++

impeller/aiks/canvas.h

@@ -22,7 +22,6 @@
 #include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/text_frame.h"
-#include "impeller/display_list/vertices_geometry.h"
 
 namespace impeller {
 

impeller/display_list/BUILD.gn

@@ -12,8 +12,8 @@ impeller_component("display_list") {
     "display_list_image_impeller.h",
     "nine_patch_converter.cc",
     "nine_patch_converter.h",
-    "vertices_geometry.cc",
-    "vertices_geometry.h",
+    "display_list_vertices_geometry.cc",
+    "display_list_vertices_geometry.h",
   ]
 
   public_deps = [

impeller/display_list/display_list_dispatcher.cc

@@ -20,8 +20,8 @@
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
 #include "impeller/display_list/display_list_image_impeller.h"
+#include "impeller/display_list/display_list_vertices_geometry.h"
 #include "impeller/display_list/nine_patch_converter.h"
-#include "impeller/display_list/vertices_geometry.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/contents/linear_gradient_contents.h"
@@ -1103,7 +1103,8 @@ void DisplayListDispatcher::drawSkVertices(const sk_sp<SkVertices> vertices,
 // |flutter::Dispatcher|
 void DisplayListDispatcher::drawVertices(const flutter::DlVertices* vertices,
                                          flutter::DlBlendMode dl_mode) {
-  canvas_.DrawVertices(VerticesGeometry::MakeVertices(vertices), ToBlendMode(dl_mode), paint_);
+  canvas_.DrawVertices(DLVerticesGeometry::MakeVertices(vertices),
+                       ToBlendMode(dl_mode), paint_);
 }
 
 // |flutter::Dispatcher|

impeller/display_list/vertices_geometry.cc → impeller/display_list/display_list_vertices_geometry.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/display_list/vertices_geometry.h"
+#include "impeller/display_list/display_list_vertices_geometry.h"
 
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
@@ -58,19 +58,19 @@ static std::vector<uint16_t> fromFanIndices(
 /////// Vertices Geometry ///////
 
 // static
-std::unique_ptr<VerticesGeometry> VerticesGeometry::MakeVertices(
+std::unique_ptr<VerticesGeometry> DLVerticesGeometry::MakeVertices(
     const flutter::DlVertices* vertices) {
-  return std::make_unique<VerticesGeometry>(vertices);
+  return std::make_unique<DLVerticesGeometry>(vertices);
 }
 
-VerticesGeometry::VerticesGeometry(const flutter::DlVertices* vertices)
+DLVerticesGeometry::DLVerticesGeometry(const flutter::DlVertices* vertices)
     : vertices_(vertices) {
   NormalizeIndices();
 }
 
-VerticesGeometry::~VerticesGeometry() = default;
+DLVerticesGeometry::~DLVerticesGeometry() = default;
 
-void VerticesGeometry::NormalizeIndices() {
+void DLVerticesGeometry::NormalizeIndices() {
   // Convert triangle fan if present.
   if (vertices_->mode() == flutter::DlVertexMode::kTriangleFan) {
     normalized_indices_ = fromFanIndices(vertices_);
@@ -79,13 +79,11 @@ void VerticesGeometry::NormalizeIndices() {
 
   auto index_count = vertices_->index_count();
   auto vertex_count = vertices_->vertex_count();
-  auto* dl_indices = vertices_->indices();
-  auto* dl_vertices = vertices_->vertices();
   if (index_count != 0 || vertex_count == 0) {
     return;
   }
   normalized_indices_.reserve(vertex_count);
-  for (size_t i = 0; i < vertex_count; i++) {
+  for (auto i = 0; i < vertex_count; i++) {
     normalized_indices_.push_back(i);
   }
 }
@@ -102,7 +100,7 @@ static PrimitiveType GetPrimitiveType(const flutter::DlVertices* vertices) {
   }
 }
 
-GeometryResult VerticesGeometry::GetPositionBuffer(
+GeometryResult DLVerticesGeometry::GetPositionBuffer(
     const ContentContext& renderer,
     const Entity& entity,
     RenderPass& pass) {
@@ -153,7 +151,7 @@ GeometryResult VerticesGeometry::GetPositionBuffer(
   };
 }
 
-GeometryResult VerticesGeometry::GetPositionColorBuffer(
+GeometryResult DLVerticesGeometry::GetPositionColorBuffer(
     const ContentContext& renderer,
     const Entity& entity,
     RenderPass& pass,
@@ -173,7 +171,7 @@ GeometryResult VerticesGeometry::GetPositionColorBuffer(
 
   std::vector<VS::PerVertexData> vertex_data(vertex_count);
   {
-    for (size_t i = 0; i < vertex_count; i++) {
+    for (auto i = 0; i < vertex_count; i++) {
       auto dl_color = dl_colors[i];
       auto pre_color = Color(dl_color.getRedF(), dl_color.getGreenF(),
                              dl_color.getBlueF(), dl_color.getAlphaF());
@@ -224,7 +222,7 @@ GeometryResult VerticesGeometry::GetPositionColorBuffer(
   };
 }
 
-GeometryResult VerticesGeometry::GetPositionUVBuffer(
+GeometryResult DLVerticesGeometry::GetPositionUVBuffer(
     const ContentContext& renderer,
     const Entity& entity,
     RenderPass& pass) {
@@ -233,15 +231,15 @@ GeometryResult VerticesGeometry::GetPositionUVBuffer(
   return {};
 }
 
-GeometryVertexType VerticesGeometry::GetVertexType() const {
+GeometryVertexType DLVerticesGeometry::GetVertexType() const {
   auto* dl_colors = vertices_->colors();
   if (dl_colors != nullptr) {
     return GeometryVertexType::kColor;
   }
   return GeometryVertexType::kPosition;
 }
 
-std::optional<Rect> VerticesGeometry::GetCoverage(
+std::optional<Rect> DLVerticesGeometry::GetCoverage(
     const Matrix& transform) const {
   return ToRect(vertices_->bounds());
 }

impeller/display_list/vertices_geometry.h → impeller/display_list/display_list_vertices_geometry.h

@@ -17,24 +17,26 @@
 namespace impeller {
 
 /// @brief A geometry that is created from a vertices object.
-class VerticesGeometry : public Geometry {
+class DLVerticesGeometry : public VerticesGeometry {
  public:
-  explicit VerticesGeometry(const flutter::DlVertices* vertices);
+  explicit DLVerticesGeometry(const flutter::DlVertices* vertices);
 
-  ~VerticesGeometry();
+  ~DLVerticesGeometry();
 
   static std::unique_ptr<VerticesGeometry> MakeVertices(
       const flutter::DlVertices* vertices);
 
+  // |VerticesGeometry|
   GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
                                         const Entity& entity,
                                         RenderPass& pass,
                                         Color paint_color,
-                                        BlendMode blend_mode);
+                                        BlendMode blend_mode) override;
 
+  // |VerticesGeometry|
   GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
                                      const Entity& entity,
-                                     RenderPass& pass);
+                                     RenderPass& pass) override;
 
   // |Geometry|
   GeometryResult GetPositionBuffer(const ContentContext& renderer,
@@ -53,7 +55,7 @@ class VerticesGeometry : public Geometry {
   const flutter::DlVertices* vertices_;
   std::vector<uint16_t> normalized_indices_;
 
-  FML_DISALLOW_COPY_AND_ASSIGN(VerticesGeometry);
+  FML_DISALLOW_COPY_AND_ASSIGN(DLVerticesGeometry);
 };
 
 }  // namespace impeller

impeller/entity/contents/vertices_contents.h

@@ -16,7 +16,6 @@
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
 #include "impeller/renderer/sampler_descriptor.h"
-#include "impeller/display_list/vertices_geometry.h"
 
 namespace impeller {
 

impeller/entity/geometry.h

@@ -70,6 +70,20 @@ class Geometry {
   virtual std::optional<Rect> GetCoverage(const Matrix& transform) const = 0;
 };
 
+/// @brief A geometry that is created from a vertices object.
+class VerticesGeometry : public Geometry {
+ public:
+  virtual GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
+                                                const Entity& entity,
+                                                RenderPass& pass,
+                                                Color paint_color,
+                                                BlendMode blend_mode) = 0;
+
+  virtual GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
+                                             const Entity& entity,
+                                             RenderPass& pass) = 0;
+};
+
 /// @brief A geometry that is created from a filled path object.
 class FillPathGeometry : public Geometry {
  public: