Skip to content

Commit 8e2d05f

Browse files
flarflar
authored
[Impeller] Re-enable fast blur path for elliptical rrects (#53704)
Fixes #151034 Fast round rects were recently restricted to circular corners, but elliptical round rects can also go through the fast path.
1 parent aaf179c commit 8e2d05f

4 files changed

Lines changed: 108 additions & 11 deletions

File tree

‎impeller/display_list/dl_golden_unittests.cc‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "impeller/display_list/dl_golden_unittests.h"
66

77
#include "flutter/display_list/dl_builder.h"
8+
#include "flutter/impeller/geometry/path_builder.h"
89
#include "flutter/testing/testing.h"
910
#include "gtest/gtest.h"
1011

@@ -182,6 +183,68 @@ TEST_P(DlGoldenTest, GaussianVsRRectBlurScaledRotated) {
182183
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
183184
}
184185

186+
TEST_P(DlGoldenTest, FastVsGeneralGaussianMaskBlur) {
187+
DisplayListBuilder builder;
188+
builder.Scale(GetContentScale().x, GetContentScale().y);
189+
builder.DrawColor(DlColor::kWhite(), DlBlendMode::kSrc);
190+
191+
auto blur_sigmas = std::array{5.0f, 10.0f, 20.0f};
192+
auto blur_colors = std::array{
193+
DlColor::kBlue(),
194+
DlColor::kGreen(),
195+
DlColor::kMaroon(),
196+
};
197+
198+
auto make_rrect_path = [](const SkRect& rect, DlScalar rx,
199+
DlScalar ry) -> SkPath {
200+
auto add_corner = [](SkPath& path, SkPoint rCorner, SkPoint rEnd) {
201+
static const auto magic = impeller::PathBuilder::kArcApproximationMagic;
202+
path.rCubicTo(rCorner.fX * (1.0f - magic), rCorner.fY * (1.0f - magic),
203+
rCorner.fX + rEnd.fX * magic, rCorner.fY + rEnd.fY * magic,
204+
rCorner.fX + rEnd.fX, rCorner.fY + rEnd.fY);
205+
};
206+
207+
SkPath path;
208+
path.moveTo(rect.fRight - rx, rect.fTop);
209+
add_corner(path, {rx, 0.0f}, {0.0f, ry});
210+
path.lineTo(rect.fRight, rect.fBottom - ry);
211+
add_corner(path, {0.0f, ry}, {-rx, 0.0f});
212+
path.lineTo(rect.fLeft + rx, rect.fBottom);
213+
add_corner(path, {-rx, 0.0f}, {0.0f, -ry});
214+
path.lineTo(rect.fLeft, rect.fTop + ry);
215+
add_corner(path, {0.0f, -ry}, {rx, 0.0f});
216+
path.close();
217+
return path;
218+
};
219+
220+
for (size_t i = 0; i < blur_sigmas.size(); i++) {
221+
auto rect = SkRect::MakeXYWH(i * 320.0f + 50.0f, 50.0f, 100.0f, 100.0f);
222+
DlPaint paint = DlPaint() //
223+
.setColor(blur_colors[i])
224+
.setMaskFilter(DlBlurMaskFilter::Make(
225+
DlBlurStyle::kNormal, blur_sigmas[i]));
226+
227+
builder.DrawRRect(SkRRect::MakeRectXY(rect, 10.0f, 10.0f), paint);
228+
rect = rect.makeOffset(150.0f, 0.0f);
229+
builder.DrawPath(make_rrect_path(rect, 10.0f, 10.0f), paint);
230+
rect = rect.makeOffset(-150.0f, 0.0f);
231+
232+
rect = rect.makeOffset(0.0f, 200.0f);
233+
builder.DrawRRect(SkRRect::MakeRectXY(rect, 10.0f, 30.0f), paint);
234+
rect = rect.makeOffset(150.0f, 0.0f);
235+
builder.DrawPath(make_rrect_path(rect, 10.0f, 20.0f), paint);
236+
rect = rect.makeOffset(-150.0f, 0.0f);
237+
238+
rect = rect.makeOffset(0.0f, 200.0f);
239+
builder.DrawRRect(SkRRect::MakeRectXY(rect, 30.0f, 10.0f), paint);
240+
rect = rect.makeOffset(150.0f, 0.0f);
241+
builder.DrawPath(make_rrect_path(rect, 20.0f, 10.0f), paint);
242+
rect = rect.makeOffset(-150.0f, 0.0f);
243+
}
244+
245+
ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
246+
}
247+
185248
TEST_P(DlGoldenTest, DashedLinesTest) {
186249
Point content_scale = GetContentScale();
187250
auto draw = [content_scale](DlCanvas* canvas,

‎impeller/display_list/skia_conversions.cc‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@
99
namespace impeller {
1010
namespace skia_conversions {
1111

12-
bool IsNearlySimpleRRect(const SkRRect& rr) {
13-
auto [a, b] = rr.radii(SkRRect::kUpperLeft_Corner);
14-
auto [c, d] = rr.radii(SkRRect::kLowerLeft_Corner);
15-
auto [e, f] = rr.radii(SkRRect::kUpperRight_Corner);
16-
auto [g, h] = rr.radii(SkRRect::kLowerRight_Corner);
12+
static inline bool SkScalarsNearlyEqual(SkScalar a,
13+
SkScalar b,
14+
SkScalar c,
15+
SkScalar d) {
1716
return SkScalarNearlyEqual(a, b, kEhCloseEnough) &&
1817
SkScalarNearlyEqual(a, c, kEhCloseEnough) &&
19-
SkScalarNearlyEqual(a, d, kEhCloseEnough) &&
20-
SkScalarNearlyEqual(a, e, kEhCloseEnough) &&
21-
SkScalarNearlyEqual(a, f, kEhCloseEnough) &&
22-
SkScalarNearlyEqual(a, g, kEhCloseEnough) &&
23-
SkScalarNearlyEqual(a, h, kEhCloseEnough);
18+
SkScalarNearlyEqual(a, d, kEhCloseEnough);
19+
}
20+
21+
bool IsNearlySimpleRRect(const SkRRect& rr) {
22+
auto [xa, ya] = rr.radii(SkRRect::kUpperLeft_Corner);
23+
auto [xb, yb] = rr.radii(SkRRect::kLowerLeft_Corner);
24+
auto [xc, yc] = rr.radii(SkRRect::kUpperRight_Corner);
25+
auto [xd, yd] = rr.radii(SkRRect::kLowerRight_Corner);
26+
return SkScalarsNearlyEqual(xa, xb, xc, xd) &&
27+
SkScalarsNearlyEqual(ya, yb, yc, yd);
2428
}
2529

2630
Rect ToRect(const SkRect& rect) {

‎impeller/display_list/skia_conversions_unittests.cc‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,35 @@ TEST(SkiaConversionsTest, IsNearlySimpleRRect) {
180180
SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 10)));
181181
EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(
182182
SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 9.999)));
183-
EXPECT_FALSE(skia_conversions::IsNearlySimpleRRect(
183+
EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(
184184
SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 9)));
185+
EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(
186+
SkRRect::MakeRectXY(SkRect::MakeLTRB(0, 0, 10, 10), 10, 5)));
187+
SkRect rect = SkRect::MakeLTRB(0, 0, 10, 10);
188+
SkRRect rrect;
189+
union {
190+
SkPoint radii[4] = {
191+
{10.0f, 9.0f},
192+
{10.0f, 9.0f},
193+
{10.0f, 9.0f},
194+
{10.0f, 9.0f},
195+
};
196+
SkScalar values[8];
197+
} test;
198+
rrect.setRectRadii(rect, test.radii);
199+
EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(rrect));
200+
for (int i = 0; i < 8; i++) {
201+
auto save = test.values[i];
202+
test.values[i] -= kEhCloseEnough * 0.5f;
203+
rrect.setRectRadii(rect, test.radii);
204+
EXPECT_TRUE(skia_conversions::IsNearlySimpleRRect(rrect))
205+
<< "values[" << i << "] == " << test.values[i];
206+
test.values[i] -= kEhCloseEnough * 2.0f;
207+
rrect.setRectRadii(rect, test.radii);
208+
EXPECT_FALSE(skia_conversions::IsNearlySimpleRRect(rrect))
209+
<< "values[" << i << "] == " << test.values[i];
210+
test.values[i] = save;
211+
}
185212
}
186213

187214
} // namespace testing

‎testing/impeller_golden_tests_output.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,9 @@ impeller_Play_DlGoldenTest_CanRenderImage_Vulkan.png
855855
impeller_Play_DlGoldenTest_DashedLinesTest_Metal.png
856856
impeller_Play_DlGoldenTest_DashedLinesTest_OpenGLES.png
857857
impeller_Play_DlGoldenTest_DashedLinesTest_Vulkan.png
858+
impeller_Play_DlGoldenTest_FastVsGeneralGaussianMaskBlur_Metal.png
859+
impeller_Play_DlGoldenTest_FastVsGeneralGaussianMaskBlur_OpenGLES.png
860+
impeller_Play_DlGoldenTest_FastVsGeneralGaussianMaskBlur_Vulkan.png
858861
impeller_Play_DlGoldenTest_GaussianVsRRectBlurScaledRotated_Metal.png
859862
impeller_Play_DlGoldenTest_GaussianVsRRectBlurScaledRotated_OpenGLES.png
860863
impeller_Play_DlGoldenTest_GaussianVsRRectBlurScaledRotated_Vulkan.png

0 commit comments

Comments
 (0)