Merge branch 'main' into blur-mask-gradients

Author: gaaclarke

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'a4fb847f47d9a63a999e57b6ff2b623d4689da2d',
+  'skia_revision': 'ff1eb5af6ce4ff6147366bce77f4a959661ab5da',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,7 +62,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '4c64fcc134bf46e18fe1d9191b635fea3e5ebdff',
+  'dart_revision': 'c3bd630e89bbf4bc5d24c5d62236ac8610d1759b',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -283,7 +283,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ef514ca5144ba0a4ce5e7075c325d24cd6da73a4',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e9df434539745202fa5f9b729fe5f82e5de3f025',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -425,7 +425,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@cbaf4ee2e59c318d7519edb5381f5fe2a7f69587',
+   Var('dart_git') + '/logging.git@7a7bd5e31ddfe23e34d37ded82d6d0cd5706862c',
 
   'src/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@1ca51664e7b1b7fe789f6be2668c909ce3aea342',
@@ -1010,7 +1010,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'lAV5jgp4796siOZgIDxa2NLJP7lcfcjMuVLO5FVgSjAC'
+        'version': 'L6_XzizcJqjneCvGA941vq-Dpu0FPwhdyfqJ0qXDUG0C'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_dart

@@ -1,4 +1,4 @@
-Signature: 58f9ae331e51c20b083f826def5adcec
+Signature: a4bee0c26a5856eab11811eacd69f3e6
 
 ====================================================================================================
 LIBRARY: dart
@@ -4747,7 +4747,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4c64fcc134bf46e18fe1d9191b635fea3e5ebdff
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/b52b754d5d3e3d6772b85c297d5d0c5988f3164d
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

ci/licenses_golden/licenses_flutter

@@ -38073,8 +38073,8 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk.cc + ../../../flutter/LICENSE
@@ -38103,7 +38103,7 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_holder.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/device_holder_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.cc + ../../../flutter/LICENSE
@@ -40924,8 +40924,8 @@ FILE: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/vertex_descriptor_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/allocator_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.cc
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/android_hardware_buffer_texture_source_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/android/ahb_texture_source_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/barrier_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/blit_command_vk.cc
@@ -40954,7 +40954,7 @@ FILE: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/descriptor_pool_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_buffer_vk.h
-FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_holder.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/device_holder_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/fence_waiter_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/formats_vk.cc

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 6ee5b48d8afe7372bf9fdc0cdf27eac5
+Signature: de13e8fff48507f700eb41b7a0aa9cf0
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 7bf5931b9d26515f1d100ceb509c287a
+Signature: f0ff62ebc4e848f1835a459c3c733ae6
 
 ====================================================================================================
 LIBRARY: etc1

impeller/aiks/aiks_blur_unittests.cc

@@ -939,6 +939,32 @@ TEST_P(AiksTest, GaussianBlurStyleSolid) {
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
+TEST_P(AiksTest, MaskBlurTexture) {
+  Scalar sigma = 30;
+  auto callback = [&](AiksContext& renderer) -> std::optional<Picture> {
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::SliderFloat("Sigma", &sigma, 0, 500);
+      ImGui::End();
+    }
+    Canvas canvas;
+    canvas.Scale(GetContentScale());
+    Paint paint;
+    paint.color = Color::Green();
+    paint.mask_blur_descriptor = Paint::MaskBlurDescriptor{
+        .style = FilterContents::BlurStyle::kNormal,
+        .sigma = Sigma(sigma),
+    };
+    std::shared_ptr<Texture> boston = CreateTextureForFixture("boston.jpg");
+    canvas.DrawImage(std::make_shared<Image>(boston), {200, 200}, paint);
+    Paint red;
+    red.color = Color::Red();
+    canvas.DrawRect(Rect::MakeXYWH(0, 0, 200, 200), red);
+    return canvas.EndRecordingAsPicture();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
 TEST_P(AiksTest, GuassianBlurUpdatesMipmapContents) {
   // This makes sure if mip maps are recycled across invocations of blurs the
   // contents get updated each frame correctly. If they aren't updated the color

impeller/aiks/canvas.cc

@@ -728,14 +728,19 @@ void Canvas::DrawImageRect(const std::shared_ptr<Image>& image,
     return;
   }
 
-  auto contents = TextureContents::MakeRect(dest);
-  contents->SetTexture(image->GetTexture());
-  contents->SetSourceRect(source);
-  contents->SetStrictSourceRect(src_rect_constraint ==
-                                SourceRectConstraint::kStrict);
-  contents->SetSamplerDescriptor(std::move(sampler));
-  contents->SetOpacity(paint.color.alpha);
-  contents->SetDeferApplyingOpacity(paint.HasColorFilter());
+  auto texture_contents = TextureContents::MakeRect(dest);
+  texture_contents->SetTexture(image->GetTexture());
+  texture_contents->SetSourceRect(source);
+  texture_contents->SetStrictSourceRect(src_rect_constraint ==
+                                        SourceRectConstraint::kStrict);
+  texture_contents->SetSamplerDescriptor(std::move(sampler));
+  texture_contents->SetOpacity(paint.color.alpha);
+  texture_contents->SetDeferApplyingOpacity(paint.HasColorFilter());
+
+  std::shared_ptr<Contents> contents = texture_contents;
+  if (paint.mask_blur_descriptor.has_value()) {
+    contents = paint.mask_blur_descriptor->CreateMaskBlur(texture_contents);
+  }
 
   Entity entity;
   entity.SetBlendMode(paint.blend_mode);

impeller/aiks/paint.cc

@@ -9,6 +9,7 @@
 #include "impeller/entity/contents/color_source_contents.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 #include "impeller/entity/contents/solid_color_contents.h"
 #include "impeller/entity/geometry/geometry.h"
 
@@ -121,6 +122,34 @@ std::shared_ptr<Contents> Paint::WithColorFilter(
                                               absorb_opacity);
 }
 
+std::shared_ptr<FilterContents> Paint::MaskBlurDescriptor::CreateMaskBlur(
+    std::shared_ptr<TextureContents> texture_contents) const {
+  Scalar expand_amount = GaussianBlurFilterContents::CalculateBlurRadius(
+      GaussianBlurFilterContents::ScaleSigma(sigma.sigma));
+  texture_contents->SetSourceRect(
+      texture_contents->GetSourceRect().Expand(expand_amount, expand_amount));
+  auto mask = std::make_shared<SolidColorContents>();
+  mask->SetColor(Color::White());
+  std::optional<Rect> coverage = texture_contents->GetCoverage({});
+  std::shared_ptr<Geometry> geometry;
+  if (coverage) {
+    texture_contents->SetDestinationRect(
+        coverage.value().Expand(expand_amount, expand_amount));
+    geometry = Geometry::MakeRect(coverage.value());
+  }
+  mask->SetGeometry(geometry);
+  auto descriptor = texture_contents->GetSamplerDescriptor();
+  texture_contents->SetSamplerDescriptor(descriptor);
+  std::shared_ptr<FilterContents> blurred_mask =
+      FilterContents::MakeGaussianBlur(FilterInput::Make(mask), sigma, sigma,
+                                       Entity::TileMode::kDecal, style,
+                                       geometry);
+
+  return ColorFilterContents::MakeBlend(
+      BlendMode::kSourceIn,
+      {FilterInput::Make(blurred_mask), FilterInput::Make(texture_contents)});
+}
+
 std::shared_ptr<FilterContents> Paint::MaskBlurDescriptor::CreateMaskBlur(
     std::shared_ptr<ColorSourceContents> color_source_contents,
     const std::shared_ptr<ColorFilter>& color_filter) const {

impeller/aiks/paint.h

@@ -13,6 +13,7 @@
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/entity/geometry/geometry.h"
 #include "impeller/geometry/color.h"
@@ -43,6 +44,9 @@ struct Paint {
         std::shared_ptr<ColorSourceContents> color_source_contents,
         const std::shared_ptr<ColorFilter>& color_filter) const;
 
+    std::shared_ptr<FilterContents> CreateMaskBlur(
+        std::shared_ptr<TextureContents> texture_contents) const;
+
     std::shared_ptr<FilterContents> CreateMaskBlur(
         const FilterInput::Ref& input,
         bool is_solid_color) const;

impeller/renderer/backend/vulkan/BUILD.gn

@@ -34,8 +34,6 @@ impeller_component("vulkan") {
   sources = [
     "allocator_vk.cc",
     "allocator_vk.h",
-    "android_hardware_buffer_texture_source_vk.cc",
-    "android_hardware_buffer_texture_source_vk.h",
     "barrier_vk.cc",
     "barrier_vk.h",
     "blit_command_vk.cc",
@@ -64,6 +62,7 @@ impeller_component("vulkan") {
     "descriptor_pool_vk.h",
     "device_buffer_vk.cc",
     "device_buffer_vk.h",
+    "device_holder_vk.h",
     "fence_waiter_vk.cc",
     "fence_waiter_vk.h",
     "formats_vk.cc",
@@ -122,6 +121,13 @@ impeller_component("vulkan") {
     "yuv_conversion_vk.h",
   ]
 
+  if (is_android) {
+    sources += [
+      "android/ahb_texture_source_vk.cc",
+      "android/ahb_texture_source_vk.h",
+    ]
+  }
+
   public_deps = [
     "../../:renderer",
     "../../../shader_archive",