From 768fbdc8b75abf344b6404ea8c662d4cc7239e5e Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 16 Jan 2024 13:16:51 -0800 Subject: [PATCH] Revert "turned filter off" This reverts commit b2f1c6987af70555b3b4ea7e7badfd8b053ec5d6. --- impeller/aiks/aiks_unittests.cc | 8 ++++---- impeller/entity/contents/filters/filter_contents.cc | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc index 48dc5a556706c..f860aa83576b1 100644 --- a/impeller/aiks/aiks_unittests.cc +++ b/impeller/aiks/aiks_unittests.cc @@ -3767,7 +3767,7 @@ TEST_P(AiksTest, GaussianBlurSetsMipCountOnPass) { return true; }); - EXPECT_EQ(1, max_mip_count); + EXPECT_EQ(4, max_mip_count); } TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) { @@ -3791,7 +3791,7 @@ TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) { max_mip_count = std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count); } - EXPECT_EQ(max_mip_count, 1lu); + EXPECT_EQ(max_mip_count, 4lu); } TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) { @@ -3817,7 +3817,7 @@ TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) { max_mip_count = std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count); } - EXPECT_EQ(max_mip_count, 1lu); + EXPECT_EQ(max_mip_count, 4lu); } TEST_P(AiksTest, GaussianBlurMipMapImageFilter) { @@ -3840,7 +3840,7 @@ TEST_P(AiksTest, GaussianBlurMipMapImageFilter) { max_mip_count = std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count); } - EXPECT_EQ(max_mip_count, 1lu); + EXPECT_EQ(max_mip_count, 4lu); } } // namespace testing diff --git a/impeller/entity/contents/filters/filter_contents.cc b/impeller/entity/contents/filters/filter_contents.cc index 235a53134c5e3..a9acd5ffd697d 100644 --- a/impeller/entity/contents/filters/filter_contents.cc +++ b/impeller/entity/contents/filters/filter_contents.cc @@ -50,6 +50,8 @@ std::shared_ptr FilterContents::MakeDirectionalGaussianBlur( return blur; } +#define IMPELLER_ENABLE_NEW_GAUSSIAN_FILTER 1 + #ifdef IMPELLER_ENABLE_NEW_GAUSSIAN_FILTER const int32_t FilterContents::kBlurFilterRequiredMipCount = 4; #else