-
Notifications
You must be signed in to change notification settings - Fork 29.7k
Migrate Mutators to DisplayList/Impeller geometry #164258
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Migrate Mutators to DisplayList/Impeller geometry #164258
Conversation
7514084 to
e4c4add
Compare
jonahwilliams
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approach LGTM. I'll look more closely tomorrow.
| const SkMatrix& matrix = (*iter)->GetMatrix(); | ||
| SkScalar matrix_array[9]; | ||
| matrix.get9(matrix_array); | ||
| case MutatorType::kTransform: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note to self, investigate if we need to drop to a 3x3 here or if we could use a full 4x4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Android class being populated was a 3x3-based class. If they have a more accurate class we can consider adopting that, in a separate issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Filed as #164596
|
|
||
| std::vector<std::shared_ptr<Mutator>>::const_iterator iter = | ||
| mutators_stack.Begin(); | ||
| while (iter != mutators_stack.End()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A note for @gmackall , we should refactor this logic to share the mutator encoding between the two platform view JNI methods.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this and the 4x4 vs 3x3 issue be combined or separate?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll leave this to @gmackall to file if necessary.
| ViewMutators mutators; | ||
| SkMatrix total_transform = SkMatrix::I(); | ||
| SkMatrix transform_accumulator = SkMatrix::I(); | ||
| flutter::DlMatrix total_transform; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if the fuchsia code is going to have a problem with this because we've ifdef'd out impeller? But if it seems to be compiling I dunno.
FYI @zanderso
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The external view embedder unit tests are failing on Fuchsia...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only thing I found wrong with them is that I was using slightly different math to convert the int alphas to float alphas. I think I fixed that in the last 2 commits.
jonahwilliams
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
I have found the source of the iOS golden failures. The code in the platform view tries to turn an rrect clip into a path, but it botches the job - you can look at it in the "old code", it doesn't have any of the typical "magic bezier scale factors" that should be there, it just repeats the corner and end points as "control points". My new code was passing the work off to an existing RR->Path converter which was doing an accurate job and that caused problems. I think I'm just going to do a straight translation of the old code into the new data structures and leave "fixing the rrect conversion" to another issue to be fixed independently (see #164595). |
|
@jonahwilliams this should be good to go now, with no golden file changes needed. |
|
Will take another look tomorrow. lets let #164525 land first, it should have only a small impact on this PR but will cause conflits one way or the other. |
8c43b81 to
1156eb5
Compare
jonahwilliams
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
|
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. For more guidance, visit Writing a golden file test for Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
|
The latest golden diffs are not intentional, I believe the issue is that the path being iterated is a converted path from the original SkPath rather than the raw path. The converted path has an approximation of the curves that doesn't match. I have an idea to enable simpler path iteration via DlPath that will isolate the caller from knowing which is the authoritative version of the path without having to embed knowledge of SkPath. |
|
The golden issue is clipping to an Oval which is handled with high precision code in the Impeller rendering, but passed along to the android platform as an approximated path. For now, we will pull out the simplified/reduced path types in the Android embedder code, but we really should handle this at a higher level (see #164666) |
jonahwilliams
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
Golden file changes are available for triage from new commit, Click here to view. For more guidance, visit Writing a golden file test for Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
|
A more general solution to the issue found with the oval clips is being pursued in #164693 Since that other PR has a risk of causing tiny golden diffs throughout the many layers of testing, it is being pursued as its own PR to have its own life cycle of potential golden image disruption. |
flutter/flutter@321fbc0...6b93cf9 2025-03-07 [email protected] Roll Skia from 32c1931117b8 to cbc7e99d6c2f (1 revision) (flutter/flutter#164788) 2025-03-07 [email protected] Roll Packages from fc9d5ca to 4c5a7ed (4 revisions) (flutter/flutter#164785) 2025-03-07 [email protected] Roll Skia from 79f8af105a61 to 32c1931117b8 (1 revision) (flutter/flutter#164782) 2025-03-07 [email protected] Roll Fuchsia Linux SDK from fhm5z889sA5T1AQao... to ixl5bKWCqsRiYGvps... (flutter/flutter#164780) 2025-03-07 [email protected] Roll Skia from 181d81920670 to 79f8af105a61 (1 revision) (flutter/flutter#164770) 2025-03-07 [email protected] Roll Skia from cc74d34e7e68 to 181d81920670 (1 revision) (flutter/flutter#164766) 2025-03-07 [email protected] Clip layers reduce rrects and paths to simpler shapes when possible (flutter/flutter#164693) 2025-03-07 [email protected] [Impeller] test empty snapshot and allocation failure. (flutter/flutter#164668) 2025-03-07 [email protected] Roll Skia from 263308ea4386 to cc74d34e7e68 (2 revisions) (flutter/flutter#164746) 2025-03-06 [email protected] Adds aria-controls support (flutter/flutter#163894) 2025-03-06 [email protected] Migrate Mutators to DisplayList/Impeller geometry (flutter/flutter#164258) 2025-03-06 [email protected] Add lldb init file (flutter/flutter#164344) 2025-03-06 [email protected] Use separate artifacts for arm64 and x64 versions of gen_snapshot on Apple platforms (flutter/flutter#164419) 2025-03-06 [email protected] Roll Skia from ccd8cc23aa94 to 263308ea4386 (1 revision) (flutter/flutter#164728) 2025-03-06 [email protected] [hcpp] Add tests for transform mutator (flutter/flutter#164664) 2025-03-06 [email protected] Roll pub packages (flutter/flutter#164721) 2025-03-06 [email protected] Roll Packages from abba683 to fc9d5ca (3 revisions) (flutter/flutter#164714) 2025-03-06 [email protected] Roll pub packages (flutter/flutter#164713) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: 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
flutter/flutter@321fbc0...6b93cf9 2025-03-07 [email protected] Roll Skia from 32c1931117b8 to cbc7e99d6c2f (1 revision) (flutter/flutter#164788) 2025-03-07 [email protected] Roll Packages from fc9d5ca to 4c5a7ed (4 revisions) (flutter/flutter#164785) 2025-03-07 [email protected] Roll Skia from 79f8af105a61 to 32c1931117b8 (1 revision) (flutter/flutter#164782) 2025-03-07 [email protected] Roll Fuchsia Linux SDK from fhm5z889sA5T1AQao... to ixl5bKWCqsRiYGvps... (flutter/flutter#164780) 2025-03-07 [email protected] Roll Skia from 181d81920670 to 79f8af105a61 (1 revision) (flutter/flutter#164770) 2025-03-07 [email protected] Roll Skia from cc74d34e7e68 to 181d81920670 (1 revision) (flutter/flutter#164766) 2025-03-07 [email protected] Clip layers reduce rrects and paths to simpler shapes when possible (flutter/flutter#164693) 2025-03-07 [email protected] [Impeller] test empty snapshot and allocation failure. (flutter/flutter#164668) 2025-03-07 [email protected] Roll Skia from 263308ea4386 to cc74d34e7e68 (2 revisions) (flutter/flutter#164746) 2025-03-06 [email protected] Adds aria-controls support (flutter/flutter#163894) 2025-03-06 [email protected] Migrate Mutators to DisplayList/Impeller geometry (flutter/flutter#164258) 2025-03-06 [email protected] Add lldb init file (flutter/flutter#164344) 2025-03-06 [email protected] Use separate artifacts for arm64 and x64 versions of gen_snapshot on Apple platforms (flutter/flutter#164419) 2025-03-06 [email protected] Roll Skia from ccd8cc23aa94 to 263308ea4386 (1 revision) (flutter/flutter#164728) 2025-03-06 [email protected] [hcpp] Add tests for transform mutator (flutter/flutter#164664) 2025-03-06 [email protected] Roll pub packages (flutter/flutter#164721) 2025-03-06 [email protected] Roll Packages from abba683 to fc9d5ca (3 revisions) (flutter/flutter#164714) 2025-03-06 [email protected] Roll pub packages (flutter/flutter#164713) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: 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
flutter/flutter@321fbc0...6b93cf9 2025-03-07 [email protected] Roll Skia from 32c1931117b8 to cbc7e99d6c2f (1 revision) (flutter/flutter#164788) 2025-03-07 [email protected] Roll Packages from fc9d5ca to 4c5a7ed (4 revisions) (flutter/flutter#164785) 2025-03-07 [email protected] Roll Skia from 79f8af105a61 to 32c1931117b8 (1 revision) (flutter/flutter#164782) 2025-03-07 [email protected] Roll Fuchsia Linux SDK from fhm5z889sA5T1AQao... to ixl5bKWCqsRiYGvps... (flutter/flutter#164780) 2025-03-07 [email protected] Roll Skia from 181d81920670 to 79f8af105a61 (1 revision) (flutter/flutter#164770) 2025-03-07 [email protected] Roll Skia from cc74d34e7e68 to 181d81920670 (1 revision) (flutter/flutter#164766) 2025-03-07 [email protected] Clip layers reduce rrects and paths to simpler shapes when possible (flutter/flutter#164693) 2025-03-07 [email protected] [Impeller] test empty snapshot and allocation failure. (flutter/flutter#164668) 2025-03-07 [email protected] Roll Skia from 263308ea4386 to cc74d34e7e68 (2 revisions) (flutter/flutter#164746) 2025-03-06 [email protected] Adds aria-controls support (flutter/flutter#163894) 2025-03-06 [email protected] Migrate Mutators to DisplayList/Impeller geometry (flutter/flutter#164258) 2025-03-06 [email protected] Add lldb init file (flutter/flutter#164344) 2025-03-06 [email protected] Use separate artifacts for arm64 and x64 versions of gen_snapshot on Apple platforms (flutter/flutter#164419) 2025-03-06 [email protected] Roll Skia from ccd8cc23aa94 to 263308ea4386 (1 revision) (flutter/flutter#164728) 2025-03-06 [email protected] [hcpp] Add tests for transform mutator (flutter/flutter#164664) 2025-03-06 [email protected] Roll pub packages (flutter/flutter#164721) 2025-03-06 [email protected] Roll Packages from abba683 to fc9d5ca (3 revisions) (flutter/flutter#164714) 2025-03-06 [email protected] Roll pub packages (flutter/flutter#164713) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: 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
Mutator types and MutatorsStack will now use DisplayList/Impeller geometry objects.