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

[Impeller] Add direct tesselation of circles for DrawCircle and Round end caps #48103

Merged
auto-submit merged 9 commits into from
Nov 30, 2023
Merged

[Impeller] Add direct tesselation of circles for DrawCircle and Round end caps #48103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
72d57eb
[Impeller] Add direct tesselation of circles for DrawCircle and Round…
flar Nov 16, 2023
63ea32b
switch to triangle strips for circles and simplify tessellation API
flar Nov 17, 2023
d498124
Fix old naming typos in comments
flar Nov 17, 2023
cab69d8
simplify vertex accumulation
flar Nov 22, 2023
cfca2e1
re-enable GPU compute tessellator for PointFields
flar Nov 22, 2023
4b638ba
move to direct HostBuffer emplacement of tessellation results
flar Nov 22, 2023
4ccdb46
Move CircleTessellator to tessellator dir and move cache to Tessellat…
flar Nov 30, 2023
aeef542
document and refine circle division computation
flar Nov 30, 2023
16fa52d
style feedback from review
flar Nov 30, 2023
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
Prev Previous commit
Next Next commit
Move CircleTessellator to tessellator dir and move cache to Tessellat… 
…or instance
  • Loading branch information
@flar
flar committed Nov 30, 2023
commit 4ccdb468bbefa32b30cd57b18adf81a0f7f7c6a2
3 changes: 2 additions & 1 deletion ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
../../../flutter/impeller/entity/contents/vertices_contents_unittests.cc
../../../flutter/impeller/entity/entity_pass_target_unittests.cc
../../../flutter/impeller/entity/entity_unittests.cc
../../../flutter/impeller/entity/geometry/circle_tessellator_unittests.cc
../../../flutter/impeller/entity/geometry/geometry_unittests.cc
../../../flutter/impeller/entity/render_target_cache_unittests.cc
../../../flutter/impeller/fixtures
Expand All @@ -157,6 +156,7 @@
../../../flutter/impeller/geometry/path_unittests.cc
../../../flutter/impeller/geometry/rect_unittests.cc
../../../flutter/impeller/geometry/size_unittests.cc
../../../flutter/impeller/geometry/trig_unittests.cc
../../../flutter/impeller/golden_tests/README.md
../../../flutter/impeller/golden_tests_harvester/.dart_tool
../../../flutter/impeller/golden_tests_harvester/.gitignore
Expand Down Expand Up @@ -194,6 +194,7 @@
../../../flutter/impeller/scene/importer/importer_unittests.cc
../../../flutter/impeller/scene/scene_unittests.cc
../../../flutter/impeller/shader_archive/shader_archive_unittests.cc
../../../flutter/impeller/tessellator/circle_tessellator_unittests.cc
../../../flutter/impeller/tessellator/dart/.dart_tool
../../../flutter/impeller/tessellator/dart/pubspec.lock
../../../flutter/impeller/tessellator/dart/pubspec.yaml
Expand Down
12 changes: 8 additions & 4 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5099,8 +5099,6 @@ ORIGIN: ../../../flutter/impeller/entity/entity_pass_target.cc + ../../../flutte
ORIGIN: ../../../flutter/impeller/entity/entity_pass_target.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/entity_playground.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/entity_playground.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/geometry/circle_tessellator.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/geometry/circle_tessellator.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/geometry/cover_geometry.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/geometry/cover_geometry.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/entity/geometry/ellipse_geometry.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -5210,6 +5208,8 @@ ORIGIN: ../../../flutter/impeller/geometry/sigma.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/sigma.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/size.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/size.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/trig.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/trig.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/type_traits.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/type_traits.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/geometry/vector.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -5527,6 +5527,8 @@ ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_writer.cc + ../.
ORIGIN: ../../../flutter/impeller/shader_archive/shader_archive_writer.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/c/tessellator.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/c/tessellator.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/circle_tessellator.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/circle_tessellator.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/tessellator.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/tessellator/tessellator.h + ../../../flutter/LICENSE
Expand Down Expand Up @@ -7895,8 +7897,6 @@ FILE: ../../../flutter/impeller/entity/entity_pass_target.cc
FILE: ../../../flutter/impeller/entity/entity_pass_target.h
FILE: ../../../flutter/impeller/entity/entity_playground.cc
FILE: ../../../flutter/impeller/entity/entity_playground.h
FILE: ../../../flutter/impeller/entity/geometry/circle_tessellator.cc
FILE: ../../../flutter/impeller/entity/geometry/circle_tessellator.h
FILE: ../../../flutter/impeller/entity/geometry/cover_geometry.cc
FILE: ../../../flutter/impeller/entity/geometry/cover_geometry.h
FILE: ../../../flutter/impeller/entity/geometry/ellipse_geometry.cc
Expand Down Expand Up @@ -8006,6 +8006,8 @@ FILE: ../../../flutter/impeller/geometry/sigma.cc
FILE: ../../../flutter/impeller/geometry/sigma.h
FILE: ../../../flutter/impeller/geometry/size.cc
FILE: ../../../flutter/impeller/geometry/size.h
FILE: ../../../flutter/impeller/geometry/trig.cc
FILE: ../../../flutter/impeller/geometry/trig.h
FILE: ../../../flutter/impeller/geometry/type_traits.cc
FILE: ../../../flutter/impeller/geometry/type_traits.h
FILE: ../../../flutter/impeller/geometry/vector.cc
Expand Down Expand Up @@ -8324,6 +8326,8 @@ FILE: ../../../flutter/impeller/shader_archive/shader_archive_writer.cc
FILE: ../../../flutter/impeller/shader_archive/shader_archive_writer.h
FILE: ../../../flutter/impeller/tessellator/c/tessellator.cc
FILE: ../../../flutter/impeller/tessellator/c/tessellator.h
FILE: ../../../flutter/impeller/tessellator/circle_tessellator.cc
FILE: ../../../flutter/impeller/tessellator/circle_tessellator.h
FILE: ../../../flutter/impeller/tessellator/dart/lib/tessellator.dart
FILE: ../../../flutter/impeller/tessellator/tessellator.cc
FILE: ../../../flutter/impeller/tessellator/tessellator.h
Expand Down
3 changes: 0 additions & 3 deletions impeller/entity/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ impeller_component("entity") {
"entity_pass_delegate.h",
"entity_pass_target.cc",
"entity_pass_target.h",
"geometry/circle_tessellator.cc",
"geometry/circle_tessellator.h",
"geometry/cover_geometry.cc",
"geometry/cover_geometry.h",
"geometry/ellipse_geometry.cc",
Expand Down Expand Up @@ -270,7 +268,6 @@ impeller_component("entity_unittests") {
"entity_playground.cc",
"entity_playground.h",
"entity_unittests.cc",
"geometry/circle_tessellator_unittests.cc",
"geometry/geometry_unittests.cc",
"render_target_cache_unittests.cc",
]
Expand Down
109 changes: 0 additions & 109 deletions impeller/entity/geometry/circle_tessellator.cc
View file
Open in desktop

This file was deleted.

136 changes: 0 additions & 136 deletions impeller/entity/geometry/circle_tessellator_unittests.cc
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions impeller/entity/geometry/ellipse_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

#include "flutter/impeller/entity/geometry/circle_tessellator.h"
#include "flutter/impeller/tessellator/circle_tessellator.h"

namespace impeller {

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

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

Scalar radius = radius_;
const Point& center = center_;
CircleTessellator tessellator(entity.GetTransform(), radius_);
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
CircleTessellator tessellator(t, entity.GetTransform(), radius_);
size_t count = tessellator.GetCircleVertexCount();
auto vertex_buffer = host_buffer.Emplace(
count * sizeof(VT), alignof(VT),
Expand Down
8 changes: 5 additions & 3 deletions impeller/entity/geometry/line_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

#include "flutter/impeller/entity/geometry/circle_tessellator.h"
#include "flutter/impeller/tessellator/circle_tessellator.h"

namespace impeller {

Expand Down Expand Up @@ -80,7 +80,8 @@ GeometryResult LineGeometry::GetPositionBuffer(const ContentContext& renderer,
const Point& p0 = p0_;
const Point& p1 = p1_;

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

CircleTessellator tessellator(transform, radius);
std::shared_ptr<Tessellator> t = renderer.GetTessellator();
CircleTessellator tessellator(t, entity.GetTransform(), radius);
count = tessellator.GetCircleVertexCount();
vertex_buffer = host_buffer.Emplace(
count * sizeof(VT), alignof(VT),
Expand Down
Loading