added check for no mips

gaaclarke · Jan 16, 2024 · 068fbfc · 068fbfc
1 parent 768fbdc
commit 068fbfc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/impeller/aiks/aiks_unittests.cc b/impeller/aiks/aiks_unittests.cc
@@ -22,6 +22,7 @@
 #include "impeller/aiks/testing/context_spy.h"
 #include "impeller/core/capture.h"
 #include "impeller/entity/contents/conical_gradient_contents.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/contents/linear_gradient_contents.h"
 #include "impeller/entity/contents/radial_gradient_contents.h"
@@ -3795,6 +3796,7 @@ TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) {
 }
 
 TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) {
+  fml::testing::LogCapture log_capture;
   Canvas canvas;
   canvas.DrawPaint({.color = Color::Wheat()});
   canvas.SaveLayer({.blend_mode = BlendMode::kMultiply});
@@ -3818,9 +3820,12 @@ TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) {
         std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count);
   }
   EXPECT_EQ(max_mip_count, 4lu);
+  EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+            std::string::npos);
 }
 
 TEST_P(AiksTest, GaussianBlurMipMapImageFilter) {
+  fml::testing::LogCapture log_capture;
   Canvas canvas;
   canvas.SaveLayer(
       {.image_filter = ImageFilter::MakeBlur(Sigma(30), Sigma(30),
@@ -3841,6 +3846,8 @@ TEST_P(AiksTest, GaussianBlurMipMapImageFilter) {
         std::max(it->texture->GetTextureDescriptor().mip_count, max_mip_count);
   }
   EXPECT_EQ(max_mip_count, 4lu);
+  EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
+            std::string::npos);
 }
 
 }  // namespace testing

diff --git a/impeller/aiks/canvas.cc b/impeller/aiks/canvas.cc
@@ -190,6 +190,9 @@ void Canvas::Save(bool create_subpass,
       MipCountVisitor mip_count_visitor;
       backdrop_filter->Visit(mip_count_visitor);
       subpass->SetRequiredMipCount(mip_count_visitor.GetRequiredMipCount());
+      current_pass_->SetRequiredMipCount(
+          std::max(current_pass_->GetRequiredMipCount(),
+                   mip_count_visitor.GetRequiredMipCount()));
     }
     subpass->SetBlendMode(blend_mode);
     current_pass_ = GetCurrentPass().AddSubpass(std::move(subpass));

diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
@@ -189,6 +189,9 @@ Rect MakeReferenceUVs(const Rect& reference, const Rect& rect) {
 }
 }  // namespace
 
+std::string_view GaussianBlurFilterContents::kNoMipsError =
+    "Applying gaussian blur without mipmap.";
+
 GaussianBlurFilterContents::GaussianBlurFilterContents(
     Scalar sigma_x,
     Scalar sigma_y,
@@ -280,7 +283,7 @@ std::optional<Entity> GaussianBlurFilterContents::RenderFilter(
 
   // In order to avoid shimmering in downsampling step, we should have mips.
   if (input_snapshot->texture->GetMipCount() <= 1) {
-    FML_DLOG(ERROR) << "Applying gaussian blur without mipmap.";
+    FML_DLOG(ERROR) << kNoMipsError;
   }
   FML_DCHECK(!input_snapshot->texture->NeedsMipmapGeneration());
 

diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.h b/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
@@ -27,6 +27,8 @@ KernelPipeline::FragmentShader::KernelSamples GenerateBlurInfo(
 /// Note: This will replace `DirectionalGaussianBlurFilterContents`.
 class GaussianBlurFilterContents final : public FilterContents {
  public:
+  static std::string_view kNoMipsError;
+
   explicit GaussianBlurFilterContents(Scalar sigma_x,
                                       Scalar sigma_y,
                                       Entity::TileMode tile_mode);