This repository was archived by the owner on Feb 25, 2025. It is now read-only.
[Impeller] rectangle packer actually packs. #52781
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonahwilliams
commented
May 13, 2024
| ASSERT_EQ(packer->PercentFull(), 0); | ||
| } | ||
|
|
||
| TEST_P(TypographerTest, GlyphAtlasTextureIsRecycledWhenContentsAreRecreated) { |
Contributor
Author
There was a problem hiding this comment.
This test really depends on the exact atlas sizing and how efficient the packing is, making it unstable. I'm removing it for now.
|
|
||
| #include <algorithm> | ||
| #include <vector> | ||
| #include "fml/logging.h" |
Member
There was a problem hiding this comment.
Nit: flutter/fml/logging.h
| bool AddRect(int w, int h, IPoint16* loc) final; | ||
|
|
||
| Scalar PercentFull() const final { | ||
| float PercentFull() const final { |
Member
There was a problem hiding this comment.
Scalars are floats already.
| // 'y' with the y-location at which it fits (the x location is pulled from | ||
| // 'skylineIndex's segment. | ||
| bool rectangleFits(int skylineIndex, int width, int height, int* y) const; | ||
| bool rectangleFits(size_t skylineIndex, int width, int height, int* y) const; |
Member
There was a problem hiding this comment.
Here and elsewhere, use the PascalCase per the style guide?
| for (int i = skylineIndex + 1; i < (int)skyline_.size(); ++i) { | ||
| // The new segment subsumes all or part of skyline_[i] | ||
| for (auto i = skylineIndex + 1; i < skyline_.size(); ++i) { | ||
| // The new segment subsumes all or part of fSkyline[i] |
Member
There was a problem hiding this comment.
If fSkyline referring to the right ivar?
Contributor
Author
There was a problem hiding this comment.
oops, I had re-ported this from skia and missed some renames.
matanlurey
approved these changes
May 13, 2024
chinmaygarde
approved these changes
May 13, 2024
| for (auto i = 0u; i < skyline_.size(); ++i) { | ||
| int y; | ||
| if (this->rectangleFits(i, width, height, &y)) { | ||
| if (this->RectangleFits(i, width, height, &y)) { |
| if (skyline_[i].y_ == skyline_[i + 1].y_) { | ||
| skyline_[i].width_ += skyline_[i + 1].width_; | ||
| skyline_.erase(std::next(skyline_.begin(), i)); | ||
| skyline_.erase(skyline_.begin() + i + 1); |
Member
There was a problem hiding this comment.
I always have a tough time reading the stuff that returns an iterator you must use to modify the container.
But, this is an off by one error right? That is std::next(begin(), i) + 1 would have been the same thing?
Contributor
Author
There was a problem hiding this comment.
Yeah, looking at the diff I think this was the bug.
Member
There was a problem hiding this comment.
Thanks. I was wondering what was different.
jonahwilliams
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
May 14, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
May 14, 2024
…148274) flutter/engine@7dcbd93...13a561c 2024-05-13 [email protected] [Impeller] rectangle packer actually packs. (flutter/engine#52781) 2024-05-13 [email protected] Roll Skia from 75b3286ecaac to 400c6fbeace8 (6 revisions) (flutter/engine#52783) 2024-05-13 [email protected] ios_external_view_embedder to ARC (flutter/engine#52782) 2024-05-13 [email protected] Roll Dart SDK from a0a940f07d56 to 7c7767ecc3d7 (2 revisions) (flutter/engine#52777) 2024-05-13 [email protected] Remove outdated comment. (flutter/engine#52778) 2024-05-13 [email protected] [Impeller] Prepare a SkiaGPU-less iOS build. (flutter/engine#52748) 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes flutter/flutter#148251
Work towards flutter/flutter#138798
The rectangle packer was only filling up the top and right edge of each rectangle, making the atlas super inefficient.