diff --git a/impeller/entity/geometry/circle_geometry.cc b/impeller/entity/geometry/circle_geometry.cc index 4f782feeb1441..6152e1270b20b 100644 --- a/impeller/entity/geometry/circle_geometry.cc +++ b/impeller/entity/geometry/circle_geometry.cc @@ -44,10 +44,6 @@ GeometryResult CircleGeometry::GetPositionBuffer(const ContentContext& renderer, return ComputePositionGeometry(renderer, generator, entity, pass); } -GeometryVertexType CircleGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional CircleGeometry::GetCoverage(const Matrix& transform) const { Point corners[4]{ {center_.x, center_.y - radius_}, diff --git a/impeller/entity/geometry/circle_geometry.h b/impeller/entity/geometry/circle_geometry.h index d715a2fc02e2e..8493f11eafea4 100644 --- a/impeller/entity/geometry/circle_geometry.h +++ b/impeller/entity/geometry/circle_geometry.h @@ -33,9 +33,6 @@ class CircleGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/cover_geometry.cc b/impeller/entity/geometry/cover_geometry.cc index cdf64d70c7fb4..6c38d28d494ff 100644 --- a/impeller/entity/geometry/cover_geometry.cc +++ b/impeller/entity/geometry/cover_geometry.cc @@ -33,10 +33,6 @@ GeometryResult CoverGeometry::GetPositionBuffer(const ContentContext& renderer, }; } -GeometryVertexType CoverGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional CoverGeometry::GetCoverage(const Matrix& transform) const { return Rect::MakeMaximum(); } diff --git a/impeller/entity/geometry/cover_geometry.h b/impeller/entity/geometry/cover_geometry.h index 5dfe6a76e8a3b..1d238fbc9949b 100644 --- a/impeller/entity/geometry/cover_geometry.h +++ b/impeller/entity/geometry/cover_geometry.h @@ -28,9 +28,6 @@ class CoverGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/ellipse_geometry.cc b/impeller/entity/geometry/ellipse_geometry.cc index 623c9a8abf8a9..76e457f2013df 100644 --- a/impeller/entity/geometry/ellipse_geometry.cc +++ b/impeller/entity/geometry/ellipse_geometry.cc @@ -22,10 +22,6 @@ GeometryResult EllipseGeometry::GetPositionBuffer( entity, pass); } -GeometryVertexType EllipseGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional EllipseGeometry::GetCoverage( const Matrix& transform) const { return bounds_.TransformBounds(transform); diff --git a/impeller/entity/geometry/ellipse_geometry.h b/impeller/entity/geometry/ellipse_geometry.h index 734899bb28619..941f7a2b58882 100644 --- a/impeller/entity/geometry/ellipse_geometry.h +++ b/impeller/entity/geometry/ellipse_geometry.h @@ -31,9 +31,6 @@ class EllipseGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/fill_path_geometry.cc b/impeller/entity/geometry/fill_path_geometry.cc index de2ad2c2f5f57..8bfe86ced19e0 100644 --- a/impeller/entity/geometry/fill_path_geometry.cc +++ b/impeller/entity/geometry/fill_path_geometry.cc @@ -71,10 +71,6 @@ GeometryResult::Mode FillPathGeometry::GetResultMode() const { FML_UNREACHABLE(); } -GeometryVertexType FillPathGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional FillPathGeometry::GetCoverage( const Matrix& transform) const { return path_.GetTransformedBoundingBox(transform); diff --git a/impeller/entity/geometry/fill_path_geometry.h b/impeller/entity/geometry/fill_path_geometry.h index 9127084a3384f..104ba0a6811e6 100644 --- a/impeller/entity/geometry/fill_path_geometry.h +++ b/impeller/entity/geometry/fill_path_geometry.h @@ -29,9 +29,6 @@ class FillPathGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/geometry.h b/impeller/entity/geometry/geometry.h index 70939b8f0dc63..40dc0815584c5 100644 --- a/impeller/entity/geometry/geometry.h +++ b/impeller/entity/geometry/geometry.h @@ -45,12 +45,6 @@ static const GeometryResult kEmptyResult = { }, }; -enum GeometryVertexType { - kPosition, - kColor, - kUV, -}; - class Geometry { public: static std::shared_ptr MakeFillPath( @@ -95,8 +89,6 @@ class Geometry { virtual GeometryResult::Mode GetResultMode() const; - virtual GeometryVertexType GetVertexType() const = 0; - virtual std::optional GetCoverage(const Matrix& transform) const = 0; /// @brief Determines if this geometry, transformed by the given diff --git a/impeller/entity/geometry/line_geometry.cc b/impeller/entity/geometry/line_geometry.cc index cb4c658fca7a2..c04c32626f7a3 100644 --- a/impeller/entity/geometry/line_geometry.cc +++ b/impeller/entity/geometry/line_geometry.cc @@ -108,10 +108,6 @@ GeometryResult LineGeometry::GetPositionBuffer(const ContentContext& renderer, }; } -GeometryVertexType LineGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional LineGeometry::GetCoverage(const Matrix& transform) const { Point corners[4]; if (!ComputeCorners(corners, transform, cap_ != Cap::kButt)) { diff --git a/impeller/entity/geometry/line_geometry.h b/impeller/entity/geometry/line_geometry.h index 072dc7056b70b..58e00e5d32588 100644 --- a/impeller/entity/geometry/line_geometry.h +++ b/impeller/entity/geometry/line_geometry.h @@ -51,9 +51,6 @@ class LineGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/point_field_geometry.cc b/impeller/entity/geometry/point_field_geometry.cc index dd169b1823fd6..812f72eda0b79 100644 --- a/impeller/entity/geometry/point_field_geometry.cc +++ b/impeller/entity/geometry/point_field_geometry.cc @@ -202,11 +202,6 @@ size_t PointFieldGeometry::ComputeCircleDivisions(Scalar scaled_radius, return std::min(scaled_radius, 140.0f); } -// |Geometry| -GeometryVertexType PointFieldGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - // |Geometry| std::optional PointFieldGeometry::GetCoverage( const Matrix& transform) const { diff --git a/impeller/entity/geometry/point_field_geometry.h b/impeller/entity/geometry/point_field_geometry.h index 1c5fa1fc0212c..c175b7de93023 100644 --- a/impeller/entity/geometry/point_field_geometry.h +++ b/impeller/entity/geometry/point_field_geometry.h @@ -23,9 +23,6 @@ class PointFieldGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/rect_geometry.cc b/impeller/entity/geometry/rect_geometry.cc index f4b1dff2fde04..6c88015079294 100644 --- a/impeller/entity/geometry/rect_geometry.cc +++ b/impeller/entity/geometry/rect_geometry.cc @@ -25,10 +25,6 @@ GeometryResult RectGeometry::GetPositionBuffer(const ContentContext& renderer, }; } -GeometryVertexType RectGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional RectGeometry::GetCoverage(const Matrix& transform) const { return rect_.TransformBounds(transform); } diff --git a/impeller/entity/geometry/rect_geometry.h b/impeller/entity/geometry/rect_geometry.h index 57ff2fd0152a6..d7b90d41424a1 100644 --- a/impeller/entity/geometry/rect_geometry.h +++ b/impeller/entity/geometry/rect_geometry.h @@ -26,9 +26,6 @@ class RectGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/round_rect_geometry.cc b/impeller/entity/geometry/round_rect_geometry.cc index ae95d728d8b90..fea43dbb38200 100644 --- a/impeller/entity/geometry/round_rect_geometry.cc +++ b/impeller/entity/geometry/round_rect_geometry.cc @@ -19,10 +19,6 @@ GeometryResult RoundRectGeometry::GetPositionBuffer( entity, pass); } -GeometryVertexType RoundRectGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional RoundRectGeometry::GetCoverage( const Matrix& transform) const { return bounds_.TransformBounds(transform); diff --git a/impeller/entity/geometry/round_rect_geometry.h b/impeller/entity/geometry/round_rect_geometry.h index ee55bdc258ea0..b3b7957aca2e3 100644 --- a/impeller/entity/geometry/round_rect_geometry.h +++ b/impeller/entity/geometry/round_rect_geometry.h @@ -31,9 +31,6 @@ class RoundRectGeometry final : public Geometry { const Entity& entity, RenderPass& pass) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/stroke_path_geometry.cc b/impeller/entity/geometry/stroke_path_geometry.cc index f6eb60fe2b100..cc7a3da53ed8a 100644 --- a/impeller/entity/geometry/stroke_path_geometry.cc +++ b/impeller/entity/geometry/stroke_path_geometry.cc @@ -558,10 +558,6 @@ GeometryResult::Mode StrokePathGeometry::GetResultMode() const { return GeometryResult::Mode::kPreventOverdraw; } -GeometryVertexType StrokePathGeometry::GetVertexType() const { - return GeometryVertexType::kPosition; -} - std::optional StrokePathGeometry::GetCoverage( const Matrix& transform) const { auto path_bounds = path_.GetBoundingBox(); diff --git a/impeller/entity/geometry/stroke_path_geometry.h b/impeller/entity/geometry/stroke_path_geometry.h index 1772e8ada685d..3c26e8d55ee99 100644 --- a/impeller/entity/geometry/stroke_path_geometry.h +++ b/impeller/entity/geometry/stroke_path_geometry.h @@ -37,9 +37,6 @@ class StrokePathGeometry final : public Geometry { // |Geometry| GeometryResult::Mode GetResultMode() const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; diff --git a/impeller/entity/geometry/vertices_geometry.cc b/impeller/entity/geometry/vertices_geometry.cc index b0df8e1c06e83..23f2a0a9146dc 100644 --- a/impeller/entity/geometry/vertices_geometry.cc +++ b/impeller/entity/geometry/vertices_geometry.cc @@ -304,17 +304,6 @@ GeometryResult VerticesGeometry::GetPositionUVColorBuffer( }; } -GeometryVertexType VerticesGeometry::GetVertexType() const { - if (HasVertexColors()) { - return GeometryVertexType::kColor; - } - if (HasTextureCoordinates()) { - return GeometryVertexType::kUV; - } - - return GeometryVertexType::kPosition; -} - std::optional VerticesGeometry::GetCoverage( const Matrix& transform) const { return bounds_.TransformBounds(transform); diff --git a/impeller/entity/geometry/vertices_geometry.h b/impeller/entity/geometry/vertices_geometry.h index 397a0ebf89c1e..0b151b1b79cad 100644 --- a/impeller/entity/geometry/vertices_geometry.h +++ b/impeller/entity/geometry/vertices_geometry.h @@ -51,9 +51,6 @@ class VerticesGeometry final : public Geometry { // |Geometry| std::optional GetCoverage(const Matrix& transform) const override; - // |Geometry| - GeometryVertexType GetVertexType() const override; - bool HasVertexColors() const; bool HasTextureCoordinates() const;