Fixes blend + color filter

Author: gaaclarke

engine.code-workspace

@@ -232,6 +232,32 @@
           "kind": "build"
         }
       },
+      {
+        "type": "shell",
+        "command": "./flutter/bin/et",
+        "options": {
+          "cwd": "${workspaceFolder}/.."
+        },
+        "problemMatcher": [
+          "$gcc"
+        ],
+        "presentation": {
+          "echo": true,
+          "reveal": "silent",
+          "focus": false,
+          "panel": "shared",
+          "clear": true
+        },
+        "group": {
+          "kind": "build"
+        },
+        "label": "host_debug_unopt_arm64",
+        "args": [
+          "build",
+          "-c",
+          "host_debug_unopt_arm64"
+        ]
+      },
       {
         "type": "shell",
         "command": "./flutter/bin/et",
@@ -285,6 +311,68 @@
           "host_debug_unopt_arm64",
           "//flutter/impeller/golden_tests:impeller_golden_tests"
         ]
+      },
+      {
+        "type": "shell",
+        "command": "./flutter/bin/et",
+        "options": {
+          "cwd": "${workspaceFolder}/.."
+        },
+        "problemMatcher": [
+          "$gcc"
+        ],
+        "presentation": {
+          "echo": true,
+          "reveal": "silent",
+          "focus": false,
+          "panel": "shared",
+          "clear": true
+        },
+        "group": {
+          "kind": "build"
+        },
+        "label": "ios_debug_unopt_arm64",
+        "args": [
+          "build",
+          "-c",
+          "host_debug_unopt_arm64",
+          "&&",
+          "./flutter/bin/et",
+          "build",
+          "-c",
+          "ios_debug_unopt"
+        ]
+      },
+      {
+        "type": "shell",
+        "command": "./flutter/bin/et",
+        "options": {
+          "cwd": "${workspaceFolder}/.."
+        },
+        "problemMatcher": [
+          "$gcc"
+        ],
+        "presentation": {
+          "echo": true,
+          "reveal": "silent",
+          "focus": false,
+          "panel": "shared",
+          "clear": true
+        },
+        "group": {
+          "kind": "build"
+        },
+        "label": "android_debug_unopt_arm64",
+        "args": [
+          "build",
+          "-c",
+          "host_debug_unopt_arm64",
+          "&&",
+          "./flutter/bin/et",
+          "build",
+          "-c",
+          "android_debug_unopt_arm64"
+        ]
       }
     ]
   },

impeller/display_list/aiks_dl_blend_unittests.cc

@@ -194,6 +194,58 @@ TEST_P(AiksTest, PaintBlendModeIsRespected) {
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
+// Compare results with https://api.flutter.dev/flutter/dart-ui/BlendMode.html
+TEST_P(AiksTest, ImageFilterBlend) {
+  bool has_color_filter = true;
+  auto callback = [&]() -> sk_sp<DisplayList> {
+    if (AiksTest::ImGuiBegin("Controls", nullptr,
+                             ImGuiWindowFlags_AlwaysAutoResize)) {
+      ImGui::Checkbox("has color filter", &has_color_filter);
+      ImGui::End();
+    }
+
+    DisplayListBuilder builder;
+    builder.Scale(GetContentScale().x, GetContentScale().y);
+
+    auto src_image =
+        DlImageImpeller::Make(CreateTextureForFixture("blend_mode_src.png"));
+    auto dst_image =
+        DlImageImpeller::Make(CreateTextureForFixture("blend_mode_dst.png"));
+
+    std::vector<DlBlendMode> blend_modes = {
+        DlBlendMode::kSrc,     DlBlendMode::kSrcATop, DlBlendMode::kSrcOver,
+        DlBlendMode::kSrcIn,   DlBlendMode::kSrcOut,  DlBlendMode::kDst,
+        DlBlendMode::kDstATop, DlBlendMode::kDstOver, DlBlendMode::kDstIn,
+        DlBlendMode::kDstOut,  DlBlendMode::kClear,   DlBlendMode::kXor};
+
+    for (uint32_t i = 0; i < blend_modes.size(); ++i) {
+      builder.Save();
+      builder.Translate((i % 5) * 200, (i / 5) * 200);
+      builder.Scale(0.4, 0.4);
+      {
+        DlPaint dstPaint;
+        builder.DrawImage(dst_image, {0, 0}, DlImageSampling::kMipmapLinear,
+                          &dstPaint);
+      }
+      {
+        DlPaint srcPaint;
+        srcPaint.setBlendMode(blend_modes[i]);
+        if (has_color_filter) {
+          std::shared_ptr<const DlColorFilter> color_filter =
+              DlBlendColorFilter::Make(DlColor::RGBA(0.9, 0.5, 0.0, 1.0),
+                                       DlBlendMode::kSrcIn);
+          srcPaint.setColorFilter(color_filter);
+        }
+        builder.DrawImage(src_image, {0, 0}, DlImageSampling::kMipmapLinear,
+                          &srcPaint);
+      }
+      builder.Restore();
+    }
+    return builder.Build();
+  };
+  ASSERT_TRUE(OpenPlaygroundHere(callback));
+}
+
 // Bug: https://github.com/flutter/flutter/issues/142549
 TEST_P(AiksTest, BlendModePlusAlphaWideGamut) {
   EXPECT_EQ(GetContext()->GetCapabilities()->GetDefaultColorFormat(),

tools/vscode_workspace/engine-workspace.yaml

@@ -192,6 +192,12 @@ tasks:
         clear: true
       group:
         kind: build
+    - <<: *et-task
+      label: host_debug_unopt_arm64
+      args:
+        - build
+        - -c
+        - host_debug_unopt_arm64
     - <<: *et-task
       label: display_list_unittests_arm64
       args:
@@ -217,6 +223,17 @@ tasks:
         - build
         - -c
         - ios_debug_unopt
+    - <<: *et-task
+      label: android_debug_unopt_arm64
+      args:
+        - build
+        - -c
+        - host_debug_unopt_arm64
+        - "&&"
+        - *et-cmd
+        - build
+        - -c
+        - android_debug_unopt_arm64
 extensions:
   recommendations:
     # C++ TestMate