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

Commit 97f292d

Browse files
committed
Revert "turned on for macos ios only"
This reverts commit 3d8682e.
1 parent 0298cc6 commit 97f292d

File tree

1 file changed

+4
-40
lines changed

1 file changed

+4
-40
lines changed

impeller/entity/contents/filters/filter_contents.cc

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -50,54 +50,18 @@ std::shared_ptr<FilterContents> FilterContents::MakeDirectionalGaussianBlur(
5050
return blur;
5151
}
5252

53-
#if defined(FML_OS_MACOSX) || defined(FML_OS_IOS)
54-
#define IMPELLER_ENABLE_NEW_GAUSSIAN_FILTER 1
55-
#endif
56-
57-
#ifdef IMPELLER_ENABLE_NEW_GAUSSIAN_FILTER
5853
const int32_t FilterContents::kBlurFilterRequiredMipCount = 4;
59-
#else
60-
const int32_t FilterContents::kBlurFilterRequiredMipCount = 1;
61-
#endif
6254

6355
std::shared_ptr<FilterContents> FilterContents::MakeGaussianBlur(
6456
const FilterInput::Ref& input,
6557
Sigma sigma_x,
6658
Sigma sigma_y,
6759
BlurStyle blur_style,
6860
Entity::TileMode tile_mode) {
69-
constexpr bool use_new_filter =
70-
#ifdef IMPELLER_ENABLE_NEW_GAUSSIAN_FILTER
71-
true;
72-
#else
73-
false;
74-
#endif
75-
76-
// TODO(https://github.com/flutter/flutter/issues/131580): Remove once the new
77-
// blur handles all cases.
78-
if (use_new_filter) {
79-
auto blur = std::make_shared<GaussianBlurFilterContents>(
80-
sigma_x.sigma, sigma_y.sigma, tile_mode);
81-
blur->SetInputs({input});
82-
return blur;
83-
}
84-
std::shared_ptr<FilterContents> x_blur = MakeDirectionalGaussianBlur(
85-
/*input=*/input,
86-
/*sigma=*/sigma_x,
87-
/*direction=*/Point(1, 0),
88-
/*blur_style=*/BlurStyle::kNormal,
89-
/*tile_mode=*/tile_mode,
90-
/*is_second_pass=*/false,
91-
/*secondary_sigma=*/{});
92-
std::shared_ptr<FilterContents> y_blur = MakeDirectionalGaussianBlur(
93-
/*input=*/FilterInput::Make(x_blur),
94-
/*sigma=*/sigma_y,
95-
/*direction=*/Point(0, 1),
96-
/*blur_style=*/blur_style,
97-
/*tile_mode=*/tile_mode,
98-
/*is_second_pass=*/true,
99-
/*secondary_sigma=*/sigma_x);
100-
return y_blur;
61+
auto blur = std::make_shared<GaussianBlurFilterContents>(
62+
sigma_x.sigma, sigma_y.sigma, tile_mode);
63+
blur->SetInputs({input});
64+
return blur;
10165
}
10266

10367
std::shared_ptr<FilterContents> FilterContents::MakeBorderMaskBlur(

0 commit comments

Comments
 (0)