firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Impeller] remove usage of MaxBasisLength in favor of XY variant. (flutter/engine#55670)

Browse Source 
MaxBasisXYZ prevents usage of scaling factors less than one since Z is almost always 1.

Fixes https://github.com/flutter/flutter/issues/153451
This commit is contained in:
Jonah Williams 2024-10-04 19:16:37 -05:00 committed by GitHub
parent e1473c81a4
commit 767efe1ad7
5 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/impeller/entity/geometry/fill_path_geometry.cc
View File

@ -37,7 +37,7 @@ GeometryResult FillPathGeometry::GetPositionBuffer(
}
VertexBuffer vertex_buffer = renderer.GetTessellator()->TessellateConvex(
path_, host_buffer, entity.GetTransform().GetMaxBasisLength());
path_, host_buffer, entity.GetTransform().GetMaxBasisLengthXY());
return GeometryResult{
.type = PrimitiveType::kTriangleStrip,

2
engine/src/flutter/impeller/entity/geometry/stroke_path_geometry.cc
View File

@ -581,7 +581,7 @@ GeometryResult StrokePathGeometry::GetPositionBuffer(
Scalar stroke_width = std::max(stroke_width_, min_size);
auto& host_buffer = renderer.GetTransientsBuffer();
auto scale = entity.GetTransform().GetMaxBasisLength();
auto scale = entity.GetTransform().GetMaxBasisLengthXY();
PositionWriter position_writer;
auto polyline = renderer.GetTessellator()->CreateTempPolyline(path_, scale);

15
engine/src/flutter/impeller/geometry/geometry_unittests.cc
View File

@ -330,21 +330,6 @@ TEST(GeometryTest, MatrixTransformDirection) {
}
}
TEST(GeometryTest, MatrixGetMaxBasisLength) {
{
auto m = Matrix::MakeScale({3, 1, 1});
ASSERT_EQ(m.GetMaxBasisLength(), 3);
m = m * Matrix::MakeSkew(0, 4);
ASSERT_EQ(m.GetMaxBasisLength(), 5);
}
{
auto m = Matrix::MakeScale({-3, 4, 2});
ASSERT_EQ(m.GetMaxBasisLength(), 4);
}
}
TEST(GeometryTest, MatrixGetMaxBasisLengthXY) {
{
auto m = Matrix::MakeScale({3, 1, 1});

9
engine/src/flutter/impeller/geometry/matrix.cc
View File

@ -193,15 +193,6 @@ Scalar Matrix::GetDeterminant() const {
return b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
}
Scalar Matrix::GetMaxBasisLength() const {
Scalar max = 0;
for (int i = 0; i < 3; i++) {
max = std::max(max,
e[i][0] * e[i][0] + e[i][1] * e[i][1] + e[i][2] * e[i][2]);
}
return std::sqrt(max);
}
/*
* Adapted for Impeller from Graphics Gems:
* http://www.realtimerendering.com/resources/GraphicsGems/gemsii/unmatrix.c

2
engine/src/flutter/impeller/geometry/matrix.h
View File

@ -295,8 +295,6 @@ struct Matrix {
Scalar GetDeterminant() const;
Scalar GetMaxBasisLength() const;
constexpr Scalar GetMaxBasisLengthXY() const {
// The full basis computation requires computing the squared scaling factor
// for translate/scale only matrices. This substantially limits the range of