[Impeller] move Geometry methods only used in VerticesContents to VerticesGeometry

impeller/entity/contents/vertices_contents.cc

@@ -25,7 +25,7 @@ std::optional<Rect> VerticesContents::GetCoverage(const Entity& entity) const {
   return geometry_->GetCoverage(entity.GetTransformation());
 };
 
-void VerticesContents::SetGeometry(std::unique_ptr<Geometry> geometry) {
+void VerticesContents::SetGeometry(std::unique_ptr<VerticesGeometry> geometry) {
   geometry_ = std::move(geometry);
 }
 

impeller/entity/contents/vertices_contents.h

@@ -26,7 +26,7 @@ class VerticesContents final : public Contents {
 
   ~VerticesContents() override;
 
-  void SetGeometry(std::unique_ptr<Geometry> geometry);
+  void SetGeometry(std::unique_ptr<VerticesGeometry> geometry);
 
   void SetColor(Color color);
 
@@ -42,7 +42,7 @@ class VerticesContents final : public Contents {
 
  public:
   Color color_;
-  std::unique_ptr<Geometry> geometry_;
+  std::unique_ptr<VerticesGeometry> geometry_;
   BlendMode blend_mode_ = BlendMode::kSource;
 
   FML_DISALLOW_COPY_AND_ASSIGN(VerticesContents);

impeller/entity/geometry.cc

@@ -17,7 +17,7 @@ Geometry::Geometry() = default;
 Geometry::~Geometry() = default;
 
 // static
-std::unique_ptr<Geometry> Geometry::MakeVertices(Vertices vertices) {
+std::unique_ptr<VerticesGeometry> Geometry::MakeVertices(Vertices vertices) {
   return std::make_unique<VerticesGeometry>(std::move(vertices));
 }
 
@@ -171,7 +171,8 @@ GeometryResult VerticesGeometry::GetPositionUVBuffer(
     const ContentContext& renderer,
     const Entity& entity,
     RenderPass& pass) {
-  // TODO(jonahwilliams): support texture coordinates in vertices.
+  // TODO(jonahwilliams): support texture coordinates in vertices
+  // https://github.com/flutter/flutter/issues/109956
   return {};
 }
 
@@ -222,24 +223,6 @@ GeometryResult FillPathGeometry::GetPositionBuffer(
   };
 }
 
-GeometryResult FillPathGeometry::GetPositionColorBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass,
-    Color paint_color,
-    BlendMode blend_mode) {
-  // TODO(jonahwilliams): support per-color vertex in path geometry.
-  return {};
-}
-
-GeometryResult FillPathGeometry::GetPositionUVBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  // TODO(jonahwilliams): support texture coordinates in path geometry.
-  return {};
-}
-
 GeometryVertexType FillPathGeometry::GetVertexType() const {
   return GeometryVertexType::kPosition;
 }
@@ -593,24 +576,6 @@ GeometryResult StrokePathGeometry::GetPositionBuffer(
   };
 }
 
-GeometryResult StrokePathGeometry::GetPositionColorBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass,
-    Color paint_color,
-    BlendMode blend_mode) {
-  // TODO(jonahwilliams): support per-color vertex in path geometry.
-  return {};
-}
-
-GeometryResult StrokePathGeometry::GetPositionUVBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  // TODO(jonahwilliams): support texture coordinates in path geometry.
-  return {};
-}
-
 GeometryVertexType StrokePathGeometry::GetVertexType() const {
   return GeometryVertexType::kPosition;
 }
@@ -669,24 +634,6 @@ GeometryResult CoverGeometry::GetPositionBuffer(const ContentContext& renderer,
   };
 }
 
-GeometryResult CoverGeometry::GetPositionColorBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass,
-    Color paint_color,
-    BlendMode blend_mode) {
-  // TODO(jonahwilliams): support per-color vertex in cover geometry.
-  return {};
-}
-
-GeometryResult CoverGeometry::GetPositionUVBuffer(
-    const ContentContext& renderer,
-    const Entity& entity,
-    RenderPass& pass) {
-  // TODO(jonahwilliams): support texture coordinates in cover geometry.
-  return {};
-}
-
 GeometryVertexType CoverGeometry::GetVertexType() const {
   return GeometryVertexType::kPosition;
 }

impeller/entity/geometry.h

@@ -42,13 +42,15 @@ enum class Join {
   kBevel,
 };
 
+class VerticesGeometry;
+
 class Geometry {
  public:
   Geometry();
 
   virtual ~Geometry();
 
-  static std::unique_ptr<Geometry> MakeVertices(Vertices vertices);
+  static std::unique_ptr<VerticesGeometry> MakeVertices(Vertices vertices);
 
   static std::unique_ptr<Geometry> MakeFillPath(Path path);
 
@@ -65,16 +67,6 @@ class Geometry {
                                            const Entity& entity,
                                            RenderPass& pass) = 0;
 
-  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;
-
   virtual GeometryVertexType GetVertexType() const = 0;
 
   virtual std::optional<Rect> GetCoverage(const Matrix& transform) const = 0;
@@ -87,30 +79,28 @@ class VerticesGeometry : public Geometry {
 
   ~VerticesGeometry();
 
- private:
-  // |Geometry|
-  GeometryResult GetPositionBuffer(const ContentContext& renderer,
-                                   const Entity& entity,
-                                   RenderPass& pass) override;
-
-  // |Geometry|
   GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
                                         const Entity& entity,
                                         RenderPass& pass,
                                         Color paint_color,
-                                        BlendMode blend_mode) override;
+                                        BlendMode blend_mode);
 
-  // |Geometry|
   GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
                                      const Entity& entity,
-                                     RenderPass& pass) override;
+                                     RenderPass& pass);
 
   // |Geometry|
-  GeometryVertexType GetVertexType() const override;
+  GeometryResult GetPositionBuffer(const ContentContext& renderer,
+                                   const Entity& entity,
+                                   RenderPass& pass) override;
 
   // |Geometry|
   std::optional<Rect> GetCoverage(const Matrix& transform) const override;
 
+  // |Geometry|
+  GeometryVertexType GetVertexType() const override;
+
+ private:
   Vertices vertices_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(VerticesGeometry);
@@ -129,18 +119,6 @@ class FillPathGeometry : public Geometry {
                                    const Entity& entity,
                                    RenderPass& pass) override;
 
-  // |Geometry|
-  GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
-                                        const Entity& entity,
-                                        RenderPass& pass,
-                                        Color paint_color,
-                                        BlendMode blend_mode) override;
-
-  // |Geometry|
-  GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
-                                     const Entity& entity,
-                                     RenderPass& pass) override;
-
   // |Geometry|
   GeometryVertexType GetVertexType() const override;
 
@@ -192,18 +170,6 @@ class StrokePathGeometry : public Geometry {
                                    const Entity& entity,
                                    RenderPass& pass) override;
 
-  // |Geometry|
-  GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
-                                        const Entity& entity,
-                                        RenderPass& pass,
-                                        Color paint_color,
-                                        BlendMode blend_mode) override;
-
-  // |Geometry|
-  GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
-                                     const Entity& entity,
-                                     RenderPass& pass) override;
-
   // |Geometry|
   GeometryVertexType GetVertexType() const override;
 
@@ -251,18 +217,6 @@ class CoverGeometry : public Geometry {
                                    const Entity& entity,
                                    RenderPass& pass) override;
 
-  // |Geometry|
-  GeometryResult GetPositionColorBuffer(const ContentContext& renderer,
-                                        const Entity& entity,
-                                        RenderPass& pass,
-                                        Color paint_color,
-                                        BlendMode blend_mode) override;
-
-  // |Geometry|
-  GeometryResult GetPositionUVBuffer(const ContentContext& renderer,
-                                     const Entity& entity,
-                                     RenderPass& pass) override;
-
   // |Geometry|
   GeometryVertexType GetVertexType() const override;