From 4ae792950d34ff7695a3d061664d2dee5a6788b4 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 16 Jan 2024 13:44:54 -0800 Subject: [PATCH] removed the filter again --- impeller/aiks/aiks_unittests.cc | 8 ++++---- impeller/entity/contents/filters/filter_contents.cc | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc index a6b450ebd7c54..a33d9bceae203 100644 --- a/impeller/aiks/aiks_unittests.cc +++ b/impeller/aiks/aiks_unittests.cc @@ -3768,7 +3768,7 @@ TEST_P(AiksTest, GaussianBlurSetsMipCountOnPass) { return true; }); - EXPECT_EQ(4, max_mip_count); + EXPECT_EQ(1, max_mip_count); } TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) { @@ -3792,7 +3792,7 @@ TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) { max_mip_count = std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count); } - EXPECT_EQ(max_mip_count, 4lu); + EXPECT_EQ(max_mip_count, 1lu); } TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) { @@ -3819,7 +3819,7 @@ TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) { max_mip_count = std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count); } - EXPECT_EQ(max_mip_count, 4lu); + EXPECT_EQ(max_mip_count, 1lu); EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError), std::string::npos); } @@ -3845,7 +3845,7 @@ TEST_P(AiksTest, GaussianBlurMipMapImageFilter) { max_mip_count = std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count); } - EXPECT_EQ(max_mip_count, 4lu); + EXPECT_EQ(max_mip_count, 1lu); EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError), std::string::npos); } diff --git a/impeller/entity/contents/filters/filter_contents.cc b/impeller/entity/contents/filters/filter_contents.cc index a9acd5ffd697d..235a53134c5e3 100644 --- a/impeller/entity/contents/filters/filter_contents.cc +++ b/impeller/entity/contents/filters/filter_contents.cc @@ -50,8 +50,6 @@ 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