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

Commit 4ccdb46

Browse files
committed
Move CircleTessellator to tessellator dir and move cache to Tessellator instance
1 parent 4b638ba commit 4ccdb46

17 files changed

+440
-295
lines changed

ci/licenses_golden/excluded_files

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@
147147
../../../flutter/impeller/entity/contents/vertices_contents_unittests.cc
148148
../../../flutter/impeller/entity/entity_pass_target_unittests.cc
149149
../../../flutter/impeller/entity/entity_unittests.cc
150-
../../../flutter/impeller/entity/geometry/circle_tessellator_unittests.cc
151150
../../../flutter/impeller/entity/geometry/geometry_unittests.cc
152151
../../../flutter/impeller/entity/render_target_cache_unittests.cc
153152
../../../flutter/impeller/fixtures
@@ -157,6 +156,7 @@
157156
../../../flutter/impeller/geometry/path_unittests.cc
158157
../../../flutter/impeller/geometry/rect_unittests.cc
159158
../../../flutter/impeller/geometry/size_unittests.cc
159+
../../../flutter/impeller/geometry/trig_unittests.cc
160160
../../../flutter/impeller/golden_tests/README.md
161161
../../../flutter/impeller/golden_tests_harvester/.dart_tool
162162
../../../flutter/impeller/golden_tests_harvester/.gitignore
@@ -194,6 +194,7 @@
194194
../../../flutter/impeller/scene/importer/importer_unittests.cc
195195
../../../flutter/impeller/scene/scene_unittests.cc
196196
../../../flutter/impeller/shader_archive/shader_archive_unittests.cc
197+
../../../flutter/impeller/tessellator/circle_tessellator_unittests.cc
197198
../../../flutter/impeller/tessellator/dart/.dart_tool
198199
../../../flutter/impeller/tessellator/dart/pubspec.lock
199200
../../../flutter/impeller/tessellator/dart/pubspec.yaml

ci/licenses_golden/licenses_flutter

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5099,8 +5099,6 @@ ORIGIN: ../../../flutter/impeller/entity/entity_pass_target.cc + ../../../flutte
50995099
ORIGIN: ../../../flutter/impeller/entity/entity_pass_target.h + ../../../flutter/LICENSE
51005100
ORIGIN: ../../../flutter/impeller/entity/entity_playground.cc + ../../../flutter/LICENSE
51015101
ORIGIN: ../../../flutter/impeller/entity/entity_playground.h + ../../../flutter/LICENSE
5102-
ORIGIN: ../../../flutter/impeller/entity/geometry/circle_tessellator.cc + ../../../flutter/LICENSE
5103-
ORIGIN: ../../../flutter/impeller/entity/geometry/circle_tessellator.h + ../../../flutter/LICENSE
51045102
ORIGIN: ../../../flutter/impeller/entity/geometry/cover_geometry.cc + ../../../flutter/LICENSE
51055103
ORIGIN: ../../../flutter/impeller/entity/geometry/cover_geometry.h + ../../../flutter/LICENSE
51065104
ORIGIN: ../../../flutter/impeller/entity/geometry/ellipse_geometry.cc + ../../../flutter/LICENSE
@@ -5210,6 +5208,8 @@ ORIGIN: ../../../flutter/impeller/geometry/sigma.cc + ../../../flutter/LICENSE
52105208
ORIGIN: ../../../flutter/impeller/geometry/sigma.h + ../../../flutter/LICENSE
52115209
ORIGIN: ../../../flutter/impeller/geometry/size.cc + ../../../flutter/LICENSE
52125210
ORIGIN: ../../../flutter/impeller/geometry/size.h + ../../../flutter/LICENSE
5211+
ORIGIN: ../../../flutter/impeller/geometry/trig.cc + ../../../flutter/LICENSE
5212+
ORIGIN: ../../../flutter/impeller/geometry/trig.h + ../../../flutter/LICENSE
52135213
ORIGIN: ../../../flutter/impeller/geometry/type_traits.cc + ../../../flutter/LICENSE
52145214
ORIGIN: ../../../flutter/impeller/geometry/type_traits.h + ../../../flutter/LICENSE
52155215
ORIGIN: ../../../flutter/impeller/geometry/vector.cc + ../../../flutter/LICENSE
@@ -5527,6 +5527,8 @@ ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_writer.cc + ../.
55275527
ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_writer.h + ../../../flutter/LICENSE
55285528
ORIGIN: ../../../flutter/impeller/tessellator/c/tessellator.cc + ../../../flutter/LICENSE
55295529
ORIGIN: ../../../flutter/impeller/tessellator/c/tessellator.h + ../../../flutter/LICENSE
5530+
ORIGIN: ../../../flutter/impeller/tessellator/circle_tessellator.cc + ../../../flutter/LICENSE
5531+
ORIGIN: ../../../flutter/impeller/tessellator/circle_tessellator.h + ../../../flutter/LICENSE
55305532
ORIGIN: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart + ../../../flutter/LICENSE
55315533
ORIGIN: ../../../flutter/impeller/tessellator/tessellator.cc + ../../../flutter/LICENSE
55325534
ORIGIN: ../../../flutter/impeller/tessellator/tessellator.h + ../../../flutter/LICENSE
@@ -7895,8 +7897,6 @@ FILE: ../../../flutter/impeller/entity/entity_pass_target.cc
78957897
FILE: ../../../flutter/impeller/entity/entity_pass_target.h
78967898
FILE: ../../../flutter/impeller/entity/entity_playground.cc
78977899
FILE: ../../../flutter/impeller/entity/entity_playground.h
7898-
FILE: ../../../flutter/impeller/entity/geometry/circle_tessellator.cc
7899-
FILE: ../../../flutter/impeller/entity/geometry/circle_tessellator.h
79007900
FILE: ../../../flutter/impeller/entity/geometry/cover_geometry.cc
79017901
FILE: ../../../flutter/impeller/entity/geometry/cover_geometry.h
79027902
FILE: ../../../flutter/impeller/entity/geometry/ellipse_geometry.cc
@@ -8006,6 +8006,8 @@ FILE: ../../../flutter/impeller/geometry/sigma.cc
80068006
FILE: ../../../flutter/impeller/geometry/sigma.h
80078007
FILE: ../../../flutter/impeller/geometry/size.cc
80088008
FILE: ../../../flutter/impeller/geometry/size.h
8009+
FILE: ../../../flutter/impeller/geometry/trig.cc
8010+
FILE: ../../../flutter/impeller/geometry/trig.h
80098011
FILE: ../../../flutter/impeller/geometry/type_traits.cc
80108012
FILE: ../../../flutter/impeller/geometry/type_traits.h
80118013
FILE: ../../../flutter/impeller/geometry/vector.cc
@@ -8324,6 +8326,8 @@ FILE: ../../../flutter/impeller/shader_archive/shader_archive_writer.cc
83248326
FILE: ../../../flutter/impeller/shader_archive/shader_archive_writer.h
83258327
FILE: ../../../flutter/impeller/tessellator/c/tessellator.cc
83268328
FILE: ../../../flutter/impeller/tessellator/c/tessellator.h
8329+
FILE: ../../../flutter/impeller/tessellator/circle_tessellator.cc
8330+
FILE: ../../../flutter/impeller/tessellator/circle_tessellator.h
83278331
FILE: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart
83288332
FILE: ../../../flutter/impeller/tessellator/tessellator.cc
83298333
FILE: ../../../flutter/impeller/tessellator/tessellator.h

impeller/entity/BUILD.gn

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ impeller_component("entity") {
191191
"entity_pass_delegate.h",
192192
"entity_pass_target.cc",
193193
"entity_pass_target.h",
194-
"geometry/circle_tessellator.cc",
195-
"geometry/circle_tessellator.h",
196194
"geometry/cover_geometry.cc",
197195
"geometry/cover_geometry.h",
198196
"geometry/ellipse_geometry.cc",
@@ -270,7 +268,6 @@ impeller_component("entity_unittests") {
270268
"entity_playground.cc",
271269
"entity_playground.h",
272270
"entity_unittests.cc",
273-
"geometry/circle_tessellator_unittests.cc",
274271
"geometry/geometry_unittests.cc",
275272
"render_target_cache_unittests.cc",
276273
]

impeller/entity/geometry/circle_tessellator.cc

Lines changed: 0 additions & 109 deletions
This file was deleted.

impeller/entity/geometry/circle_tessellator_unittests.cc

Lines changed: 0 additions & 136 deletions
This file was deleted.

impeller/entity/geometry/ellipse_geometry.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "impeller/entity/geometry/ellipse_geometry.h"
66

7-
#include "flutter/impeller/entity/geometry/circle_tessellator.h"
7+
#include "flutter/impeller/tessellator/circle_tessellator.h"
88

99
namespace impeller {
1010

@@ -22,7 +22,8 @@ GeometryResult EllipseGeometry::GetPositionBuffer(
2222

2323
Scalar radius = radius_;
2424
const Point& center = center_;
25-
CircleTessellator tessellator(entity.GetTransform(), radius_);
25+
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
26+
CircleTessellator tessellator(t, entity.GetTransform(), radius_);
2627
size_t count = tessellator.GetCircleVertexCount();
2728
auto vertex_buffer =
2829
host_buffer.Emplace(count * sizeof(VT), alignof(VT),
@@ -65,7 +66,8 @@ GeometryResult EllipseGeometry::GetPositionUVBuffer(
6566

6667
Scalar radius = radius_;
6768
const Point& center = center_;
68-
CircleTessellator tessellator(entity.GetTransform(), radius_);
69+
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
70+
CircleTessellator tessellator(t, entity.GetTransform(), radius_);
6971
size_t count = tessellator.GetCircleVertexCount();
7072
auto vertex_buffer = host_buffer.Emplace(
7173
count * sizeof(VT), alignof(VT),

impeller/entity/geometry/line_geometry.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "impeller/entity/geometry/line_geometry.h"
66

7-
#include "flutter/impeller/entity/geometry/circle_tessellator.h"
7+
#include "flutter/impeller/tessellator/circle_tessellator.h"
88

99
namespace impeller {
1010

@@ -80,7 +80,8 @@ GeometryResult LineGeometry::GetPositionBuffer(const ContentContext& renderer,
8080
const Point& p0 = p0_;
8181
const Point& p1 = p1_;
8282

83-
CircleTessellator tessellator(transform, radius);
83+
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
84+
CircleTessellator tessellator(t, entity.GetTransform(), radius);
8485
count = tessellator.GetCircleVertexCount();
8586
vertex_buffer =
8687
host_buffer.Emplace(count * sizeof(VT), alignof(VT),
@@ -147,7 +148,8 @@ GeometryResult LineGeometry::GetPositionUVBuffer(Rect texture_coverage,
147148
const Point& p0 = p0_;
148149
const Point& p1 = p1_;
149150

150-
CircleTessellator tessellator(transform, radius);
151+
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
152+
CircleTessellator tessellator(t, entity.GetTransform(), radius);
151153
count = tessellator.GetCircleVertexCount();
152154
vertex_buffer = host_buffer.Emplace(
153155
count * sizeof(VT), alignof(VT),

0 commit comments

Comments
 (0)