Fixes merge conflict from high bitrate texture tests #179416
Merged
+51
−8
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
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request corrects a test setup by changing the default test case and extending CpuSdfCanvas to support different pixel formats. A new method _loadR32FloatSdfImage is added to generate R32F textures, and the widget initialization logic is updated to select the appropriate image loading method based on the targetFormat. My review includes suggestions to improve the robustness of the new switch statement, fix a potential bug in the distance field calculation, and reduce code duplication.
Comment on lines
90
to
120
| Future<ui.Image> _loadR32FloatSdfImage() async { | ||
| const width = 1024; | ||
| const height = 1024; | ||
| const double radius = width / 4.0; | ||
| final floats = List<double>.filled(width * height, 0.0); | ||
| for (var i = 0; i < height; ++i) { | ||
| for (var j = 0; j < width; ++j) { | ||
| double x = j.toDouble(); | ||
| double y = i.toDouble(); | ||
| x -= width / 2.0; | ||
| y -= height / 2.0; | ||
| final double length = sqrt(x * x + y * y) - radius; | ||
| final int idx = i * width + j; | ||
| floats[idx] = length - radius; | ||
| } | ||
| } | ||
| final floatList = Float32List.fromList(floats); | ||
| final intList = Uint8List.view(floatList.buffer); | ||
| final completer = Completer<ui.Image>(); | ||
| ui.decodeImageFromPixels( | ||
| intList, | ||
| width, | ||
| height, | ||
| ui.PixelFormat.rFloat32, | ||
| targetFormat: ui.TargetPixelFormat.rFloat32, | ||
| (ui.Image image) { | ||
| completer.complete(image); | ||
| }, | ||
| ); | ||
| return completer.future; | ||
| } |
Contributor
There was a problem hiding this comment.
This function is very similar to _loadRGBA32FloatSdfImage. There's a lot of duplicated code for setting up dimensions, calculating the signed distance field, and decoding the image. To improve maintainability and reduce redundancy, consider refactoring these two methods into a single one that takes the pixel format as a parameter and handles the differences internally. This would also make it easier to fix the calculation bug mentioned in the other comment in one place.
gaaclarke
added
the
autosubmit
flutter-dashboard
bot
removed
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 4, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 4, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 5, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 5, 2025
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Dec 5, 2025
Roll Flutter from 69d8710fadcd to 5b8720312a94 (42 revisions) flutter/flutter@69d8710...5b87203 2025-12-05 [email protected] Roll Packages from d39e481 to b17d3ff (3 revisions) (flutter/flutter#179505) 2025-12-05 [email protected] Move target_cpu into use_rbe block in Fuchsia build (flutter/flutter#179458) 2025-12-05 [email protected] Roll Skia from fe6bf18a3f6b to a31411879251 (3 revisions) (flutter/flutter#179499) 2025-12-05 [email protected] Force WASM single threading in Chrome extensions. (flutter/flutter#179400) 2025-12-05 [email protected] Roll Skia from aea282ea0bcd to fe6bf18a3f6b (7 revisions) (flutter/flutter#179489) 2025-12-05 [email protected] fix: check both pointer count and action before reusing MotionEvent (flutter/flutter#178528) 2025-12-05 [email protected] Roll Fuchsia Linux SDK from VtDPX2k1kosHxjKUE... to vDeTl_KBeLJY8nCAx... (flutter/flutter#179478) 2025-12-05 [email protected] [ Widget Preview ] Add embedded Widget Inspector support (flutter/flutter#178116) 2025-12-05 [email protected] bubble up fragment shader errors (flutter/flutter#179363) 2025-12-05 [email protected] Roll Dart SDK from eda82318e193 to 42fe3327abca (1 revision) (flutter/flutter#179472) 2025-12-05 [email protected] [Android 16] Use AVD With New Android Renderer (flutter/flutter#179306) 2025-12-05 [email protected] Unpin `package:dwds` dependency (flutter/flutter#179462) 2025-12-05 [email protected] [Impeller] include uniform info in impellerc json reflections (flutter/flutter#179317) 2025-12-05 [email protected] Roll Skia from 1591b066f49b to aea282ea0bcd (1 revision) (flutter/flutter#179468) 2025-12-04 [email protected] Roll Skia from e1923478562b to 1591b066f49b (3 revisions) (flutter/flutter#179460) 2025-12-04 [email protected] Cherry-pick flutter 3.38.4 changelog back to master. (flutter/flutter#179463) 2025-12-04 [email protected] [web] Add clone method to LayerPicture and dispose pictures in PictureLayer (flutter/flutter#179162) 2025-12-04 [email protected] Fixes merge conflict from high bitrate texture tests (flutter/flutter#179416) 2025-12-04 [email protected] Fix typos in `VirtualDisplayController.java` (flutter/flutter#179411) 2025-12-04 [email protected] Roll Dart SDK from 2de44cc08970 to eda82318e193 (1 revision) (flutter/flutter#179453) 2025-12-04 [email protected] Roll Skia from 55d94a54f453 to e1923478562b (1 revision) (flutter/flutter#179449) 2025-12-04 [email protected] Roll Packages from 8cb4903 to d39e481 (8 revisions) (flutter/flutter#179451) 2025-12-04 [email protected] Add DropdownMenu.selectOnly (flutter/flutter#179189) 2025-12-04 [email protected] Roll Dart SDK from 7e6bfc6af55c to 2de44cc08970 (6 revisions) (flutter/flutter#179443) 2025-12-04 [email protected] Roll Skia from b8f79d7316c0 to 55d94a54f453 (1 revision) (flutter/flutter#179439) 2025-12-04 [email protected] Revise README for link updates and terminology changes (flutter/flutter#179357) 2025-12-04 [email protected] Roll Skia from ce19122e3982 to b8f79d7316c0 (3 revisions) (flutter/flutter#179436) 2025-12-04 [email protected] Update some BottomNavigationBar comments to reflect theme normalization (flutter/flutter#179404) 2025-12-04 [email protected] Replace use of eglCreateImage with eglCreateImageKHR to reduce EGL requirement (flutter/flutter#179310) 2025-12-04 [email protected] Roll Skia from 81a9a0751f00 to ce19122e3982 (5 revisions) (flutter/flutter#179430) 2025-12-04 [email protected] [impellerc] adds entry prefix flag to avoid shader collisions (flutter/flutter#179160) 2025-12-04 [email protected] [Windows] Allow apps to prefer high power GPUs (flutter/flutter#177653) 2025-12-04 [email protected] [ Infra ] Shard `Windows tool_tests_commands` (flutter/flutter#179409) 2025-12-04 [email protected] [flutter_tools] Fix filename typo (flutter/flutter#179427) 2025-12-04 [email protected] Marks Linux_pixel_7pro draw_arcs_all_stroke_styles_perf__timeline_summary to be unflaky (flutter/flutter#179392) 2025-12-03 [email protected] Marks Mac_ios draw_arcs_all_fill_styles_perf_ios__timeline_summary to be unflaky (flutter/flutter#179391) 2025-12-03 [email protected] Marks Linux_pixel_7pro draw_arcs_all_fill_styles_perf__timeline_summary to be unflaky (flutter/flutter#179390) 2025-12-03 [email protected] Roll Abseil to 564023aa5376 (flutter/flutter#179421) 2025-12-03 [email protected] Made wide gamut tests give more information in their failure (flutter/flutter#179415) 2025-12-03 [email protected] Roll Skia from c20f797ab6f9 to 81a9a0751f00 (5 revisions) (flutter/flutter#179417) 2025-12-03 [email protected] Migrate samples and docs to RadioGroup (flutter/flutter#179158) 2025-12-03 [email protected] Roll Dart SDK to 3.11.0-200.1.beta (flutter/flutter#179399) 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 ...
reidbaker
pushed a commit
to AbdeMohlbi/flutter
that referenced
this pull request
Dec 10, 2025
flutter@d57f6f8 had a merge conflict that I resolved incorrectly. The test I was trusting to verify it was actually set to bringup, this fixes that test. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
d57f6f8 had a merge conflict that I resolved incorrectly. The test I was trusting to verify it was actually set to bringup, this fixes that test.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.