Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] delete unused geometry API. #52347

Merged
merged 1 commit into from
Apr 24, 2024
Merged

[Impeller] delete unused geometry API. #52347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions impeller/entity/geometry/circle_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Rect> CircleGeometry::GetCoverage(const Matrix& transform) const {
Point corners[4]{
{center_.x, center_.y - radius_},
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/circle_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ class CircleGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/cover_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ GeometryResult CoverGeometry::GetPositionBuffer(const ContentContext& renderer,
};
}

GeometryVertexType CoverGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> CoverGeometry::GetCoverage(const Matrix& transform) const {
return Rect::MakeMaximum();
}
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/cover_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ class CoverGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/ellipse_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ GeometryResult EllipseGeometry::GetPositionBuffer(
entity, pass);
}

GeometryVertexType EllipseGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> EllipseGeometry::GetCoverage(
const Matrix& transform) const {
return bounds_.TransformBounds(transform);
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/ellipse_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ class EllipseGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/fill_path_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ GeometryResult::Mode FillPathGeometry::GetResultMode() const {
FML_UNREACHABLE();
}

GeometryVertexType FillPathGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> FillPathGeometry::GetCoverage(
const Matrix& transform) const {
return path_.GetTransformedBoundingBox(transform);
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/fill_path_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ class FillPathGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
8 changes: 0 additions & 8 deletions impeller/entity/geometry/geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ static const GeometryResult kEmptyResult = {
},
};

enum GeometryVertexType {
kPosition,
kColor,
kUV,
};

class Geometry {
public:
static std::shared_ptr<Geometry> MakeFillPath(
Expand Down Expand Up @@ -95,8 +89,6 @@ class Geometry {

virtual GeometryResult::Mode GetResultMode() const;

virtual GeometryVertexType GetVertexType() const = 0;

virtual std::optional<Rect> GetCoverage(const Matrix& transform) const = 0;

/// @brief Determines if this geometry, transformed by the given
Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/line_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ GeometryResult LineGeometry::GetPositionBuffer(const ContentContext& renderer,
};
}

GeometryVertexType LineGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> LineGeometry::GetCoverage(const Matrix& transform) const {
Point corners[4];
if (!ComputeCorners(corners, transform, cap_ != Cap::kButt)) {
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/line_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ class LineGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
5 changes: 0 additions & 5 deletions impeller/entity/geometry/point_field_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Rect> PointFieldGeometry::GetCoverage(
const Matrix& transform) const {
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/point_field_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ class PointFieldGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/rect_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ GeometryResult RectGeometry::GetPositionBuffer(const ContentContext& renderer,
};
}

GeometryVertexType RectGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> RectGeometry::GetCoverage(const Matrix& transform) const {
return rect_.TransformBounds(transform);
}
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/rect_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ class RectGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/round_rect_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ GeometryResult RoundRectGeometry::GetPositionBuffer(
entity, pass);
}

GeometryVertexType RoundRectGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> RoundRectGeometry::GetCoverage(
const Matrix& transform) const {
return bounds_.TransformBounds(transform);
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/round_rect_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ class RoundRectGeometry final : public Geometry {
const Entity& entity,
RenderPass& pass) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
4 changes: 0 additions & 4 deletions impeller/entity/geometry/stroke_path_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,10 +558,6 @@ GeometryResult::Mode StrokePathGeometry::GetResultMode() const {
return GeometryResult::Mode::kPreventOverdraw;
}

GeometryVertexType StrokePathGeometry::GetVertexType() const {
return GeometryVertexType::kPosition;
}

std::optional<Rect> StrokePathGeometry::GetCoverage(
const Matrix& transform) const {
auto path_bounds = path_.GetBoundingBox();
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/stroke_path_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ class StrokePathGeometry final : public Geometry {
// |Geometry|
GeometryResult::Mode GetResultMode() const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

Expand Down
11 changes: 0 additions & 11 deletions impeller/entity/geometry/vertices_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Rect> VerticesGeometry::GetCoverage(
const Matrix& transform) const {
return bounds_.TransformBounds(transform);
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/geometry/vertices_geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ class VerticesGeometry final : public Geometry {
// |Geometry|
std::optional<Rect> GetCoverage(const Matrix& transform) const override;

// |Geometry|
GeometryVertexType GetVertexType() const override;

bool HasVertexColors() const;

bool HasTextureCoordinates() const;
Expand Down