Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fixes blend + color filter #55411

Merged
merged 4 commits into from
Sep 25, 2024
Merged

Conversation

gaaclarke
Copy link
Member

@gaaclarke gaaclarke commented Sep 24, 2024

fixes flutter/flutter#155456

Thanks @jason-simmons for identifying the fix.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@gaaclarke gaaclarke marked this pull request as ready for review September 25, 2024 15:37
@jason-simmons
Copy link
Member

Does BlendFilterContents::CreateForegroundAdvancedBlend also need this fix?

@gaaclarke
Copy link
Member Author

Does BlendFilterContents::CreateForegroundAdvancedBlend also need this fix?

I've filed an issue for the advanced blends ( flutter/flutter#155691 ). I'm looking into it right now, this change alone doesn't fix the advanced blends.

@flutter-dashboard
Copy link

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

Changes reported for pull request #55411 at sha 141ff45

@gaaclarke gaaclarke merged commit d143ca8 into flutter:main Sep 25, 2024
30 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 25, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 26, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 26, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 26, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Sep 26, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Sep 26, 2024
…155733)

flutter/engine@d6d5fdb...d4850c1

2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (#55444)" (flutter/engine#55454)
2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (#55418)" (flutter/engine#55450)
2024-09-25 [email protected] Reland "[canvaskit] Further improve overlay optimization by splitting pictures" (flutter/engine#55402)
2024-09-25 [email protected] Move lint suppression from `baseline.xml` to `@SuppressLint`. (flutter/engine#55447)
2024-09-25 [email protected] [engine] set platform thread name to ui. (flutter/engine#55362)
2024-09-25 [email protected] Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter/engine#55444)
2024-09-25 [email protected] [Impeller] actually fix external texture for GLES. (flutter/engine#55414)
2024-09-25 [email protected] Roll Skia from e623a37de332 to 9f3b32b7b772 (2 revisions) (flutter/engine#55443)
2024-09-25 [email protected] Remove usages of WindowManager's getDefaultDisplay (flutter/engine#55002)
2024-09-25 [email protected] Fixes blend + color filter (flutter/engine#55411)
2024-09-25 [email protected] Add a boolean that exposes rotation/crop metadata capability. (flutter/engine#55434)
2024-09-25 [email protected] Roll Skia from 9af762100cf1 to e623a37de332 (1 revision) (flutter/engine#55439)
2024-09-25 [email protected] [scenario_app] delete get bitmap activity. (flutter/engine#55436)
2024-09-25 [email protected] [Flutter GPU] Use vm.Vector4 for clear color instead of ui.Color. (flutter/engine#55416)
2024-09-25 [email protected] Roll Dart SDK from dd73afd20be5 to c2728b947e46 (1 revision) (flutter/engine#55437)
2024-09-25 [email protected] adds more tasks to the engine workspace (flutter/engine#55435)
2024-09-25 [email protected] Roll Skia from 79e652aad7a9 to 9af762100cf1 (2 revisions) (flutter/engine#55433)
2024-09-25 [email protected] Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter/engine#55418)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
thejitenpatel pushed a commit to thejitenpatel/flutter that referenced this pull request Sep 26, 2024
…lutter#155733)

flutter/engine@d6d5fdb...d4850c1

2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter#55444)" (flutter/engine#55454)
2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter#55418)" (flutter/engine#55450)
2024-09-25 [email protected] Reland "[canvaskit] Further improve overlay optimization by splitting pictures" (flutter/engine#55402)
2024-09-25 [email protected] Move lint suppression from `baseline.xml` to `@SuppressLint`. (flutter/engine#55447)
2024-09-25 [email protected] [engine] set platform thread name to ui. (flutter/engine#55362)
2024-09-25 [email protected] Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter/engine#55444)
2024-09-25 [email protected] [Impeller] actually fix external texture for GLES. (flutter/engine#55414)
2024-09-25 [email protected] Roll Skia from e623a37de332 to 9f3b32b7b772 (2 revisions) (flutter/engine#55443)
2024-09-25 [email protected] Remove usages of WindowManager's getDefaultDisplay (flutter/engine#55002)
2024-09-25 [email protected] Fixes blend + color filter (flutter/engine#55411)
2024-09-25 [email protected] Add a boolean that exposes rotation/crop metadata capability. (flutter/engine#55434)
2024-09-25 [email protected] Roll Skia from 9af762100cf1 to e623a37de332 (1 revision) (flutter/engine#55439)
2024-09-25 [email protected] [scenario_app] delete get bitmap activity. (flutter/engine#55436)
2024-09-25 [email protected] [Flutter GPU] Use vm.Vector4 for clear color instead of ui.Color. (flutter/engine#55416)
2024-09-25 [email protected] Roll Dart SDK from dd73afd20be5 to c2728b947e46 (1 revision) (flutter/engine#55437)
2024-09-25 [email protected] adds more tasks to the engine workspace (flutter/engine#55435)
2024-09-25 [email protected] Roll Skia from 79e652aad7a9 to 9af762100cf1 (2 revisions) (flutter/engine#55433)
2024-09-25 [email protected] Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter/engine#55418)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
thejitenpatel pushed a commit to thejitenpatel/flutter that referenced this pull request Sep 26, 2024
…lutter#155733)

flutter/engine@d6d5fdb...d4850c1

2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter#55444)" (flutter/engine#55454)
2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter#55418)" (flutter/engine#55450)
2024-09-25 [email protected] Reland "[canvaskit] Further improve overlay optimization by splitting pictures" (flutter/engine#55402)
2024-09-25 [email protected] Move lint suppression from `baseline.xml` to `@SuppressLint`. (flutter/engine#55447)
2024-09-25 [email protected] [engine] set platform thread name to ui. (flutter/engine#55362)
2024-09-25 [email protected] Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter/engine#55444)
2024-09-25 [email protected] [Impeller] actually fix external texture for GLES. (flutter/engine#55414)
2024-09-25 [email protected] Roll Skia from e623a37de332 to 9f3b32b7b772 (2 revisions) (flutter/engine#55443)
2024-09-25 [email protected] Remove usages of WindowManager's getDefaultDisplay (flutter/engine#55002)
2024-09-25 [email protected] Fixes blend + color filter (flutter/engine#55411)
2024-09-25 [email protected] Add a boolean that exposes rotation/crop metadata capability. (flutter/engine#55434)
2024-09-25 [email protected] Roll Skia from 9af762100cf1 to e623a37de332 (1 revision) (flutter/engine#55439)
2024-09-25 [email protected] [scenario_app] delete get bitmap activity. (flutter/engine#55436)
2024-09-25 [email protected] [Flutter GPU] Use vm.Vector4 for clear color instead of ui.Color. (flutter/engine#55416)
2024-09-25 [email protected] Roll Dart SDK from dd73afd20be5 to c2728b947e46 (1 revision) (flutter/engine#55437)
2024-09-25 [email protected] adds more tasks to the engine workspace (flutter/engine#55435)
2024-09-25 [email protected] Roll Skia from 79e652aad7a9 to 9af762100cf1 (2 revisions) (flutter/engine#55433)
2024-09-25 [email protected] Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter/engine#55418)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
jason-simmons added a commit to jason-simmons/flutter_engine that referenced this pull request Sep 26, 2024
…s::CreateForegroundAdvancedBlend

Some recent changes affecting color filters (flutter#55411, flutter#55448) need to be done for both Porter-Duff and advanced blend modes
thejitenpatel pushed a commit to thejitenpatel/flutter that referenced this pull request Sep 27, 2024
…lutter#155733)

flutter/engine@d6d5fdb...d4850c1

2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter#55444)" (flutter/engine#55454)
2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter#55418)" (flutter/engine#55450)
2024-09-25 [email protected] Reland "[canvaskit] Further improve overlay optimization by splitting pictures" (flutter/engine#55402)
2024-09-25 [email protected] Move lint suppression from `baseline.xml` to `@SuppressLint`. (flutter/engine#55447)
2024-09-25 [email protected] [engine] set platform thread name to ui. (flutter/engine#55362)
2024-09-25 [email protected] Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter/engine#55444)
2024-09-25 [email protected] [Impeller] actually fix external texture for GLES. (flutter/engine#55414)
2024-09-25 [email protected] Roll Skia from e623a37de332 to 9f3b32b7b772 (2 revisions) (flutter/engine#55443)
2024-09-25 [email protected] Remove usages of WindowManager's getDefaultDisplay (flutter/engine#55002)
2024-09-25 [email protected] Fixes blend + color filter (flutter/engine#55411)
2024-09-25 [email protected] Add a boolean that exposes rotation/crop metadata capability. (flutter/engine#55434)
2024-09-25 [email protected] Roll Skia from 9af762100cf1 to e623a37de332 (1 revision) (flutter/engine#55439)
2024-09-25 [email protected] [scenario_app] delete get bitmap activity. (flutter/engine#55436)
2024-09-25 [email protected] [Flutter GPU] Use vm.Vector4 for clear color instead of ui.Color. (flutter/engine#55416)
2024-09-25 [email protected] Roll Dart SDK from dd73afd20be5 to c2728b947e46 (1 revision) (flutter/engine#55437)
2024-09-25 [email protected] adds more tasks to the engine workspace (flutter/engine#55435)
2024-09-25 [email protected] Roll Skia from 79e652aad7a9 to 9af762100cf1 (2 revisions) (flutter/engine#55433)
2024-09-25 [email protected] Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter/engine#55418)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
thejitenpatel pushed a commit to thejitenpatel/flutter that referenced this pull request Sep 27, 2024
…lutter#155733)

flutter/engine@d6d5fdb...d4850c1

2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter#55444)" (flutter/engine#55454)
2024-09-26 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter#55418)" (flutter/engine#55450)
2024-09-25 [email protected] Reland "[canvaskit] Further improve overlay optimization by splitting pictures" (flutter/engine#55402)
2024-09-25 [email protected] Move lint suppression from `baseline.xml` to `@SuppressLint`. (flutter/engine#55447)
2024-09-25 [email protected] [engine] set platform thread name to ui. (flutter/engine#55362)
2024-09-25 [email protected] Roll Dart SDK from c2728b947e46 to 016368ee313d (1 revision) (flutter/engine#55444)
2024-09-25 [email protected] [Impeller] actually fix external texture for GLES. (flutter/engine#55414)
2024-09-25 [email protected] Roll Skia from e623a37de332 to 9f3b32b7b772 (2 revisions) (flutter/engine#55443)
2024-09-25 [email protected] Remove usages of WindowManager's getDefaultDisplay (flutter/engine#55002)
2024-09-25 [email protected] Fixes blend + color filter (flutter/engine#55411)
2024-09-25 [email protected] Add a boolean that exposes rotation/crop metadata capability. (flutter/engine#55434)
2024-09-25 [email protected] Roll Skia from 9af762100cf1 to e623a37de332 (1 revision) (flutter/engine#55439)
2024-09-25 [email protected] [scenario_app] delete get bitmap activity. (flutter/engine#55436)
2024-09-25 [email protected] [Flutter GPU] Use vm.Vector4 for clear color instead of ui.Color. (flutter/engine#55416)
2024-09-25 [email protected] Roll Dart SDK from dd73afd20be5 to c2728b947e46 (1 revision) (flutter/engine#55437)
2024-09-25 [email protected] adds more tasks to the engine workspace (flutter/engine#55435)
2024-09-25 [email protected] Roll Skia from 79e652aad7a9 to 9af762100cf1 (2 revisions) (flutter/engine#55433)
2024-09-25 [email protected] Add `SurfaceProducer#onSurfaceAvailable`, deprecate `onSurfaceCreated`. (flutter/engine#55418)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
auto-submit bot pushed a commit that referenced this pull request Sep 27, 2024
…s::CreateForegroundAdvancedBlend (#55470)

Some recent changes affecting color filters (#55411, #55448) need to be done for both Porter-Duff and advanced blend modes
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Impeller: BlendModes don't work with ColorFilters for drawImage
2 participants