Skip to content

Conversation

@walley892
Copy link
Contributor

Fixes #180101.

Our hot reloading behavior for shader uniforms only handled the case where uniforms were reordered. In the case that a uniform was renamed or deleted, and a user had acquired a handle to that uniform via getUniformFloat, we would try (and fail) to locate that uniform in the shader, and the program would crash.

This PR fixes that issue and adds a test to verify. Also manually verified on mac and android

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-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.

@walley892 walley892 requested a review from gaaclarke December 19, 2025 19:49
@github-actions github-actions bot added the engine flutter/engine related. See also e: labels. label Dec 19, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request addresses a crash during shader hot reloading when a uniform is renamed or removed. The fix involves adding a check to ensure a uniform exists before attempting to access its index. A new test case is also added to verify this fix and prevent future regressions. The changes look good and effectively solve the reported issue. I have one minor suggestion to make the code more idiomatic.

Copy link
Member

@gaaclarke gaaclarke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! thanks

@walley892 walley892 added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 29, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 29, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Dec 29, 2025

autosubmit label was removed for flutter/flutter/180138, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

@walley892 walley892 added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 29, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 29, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Dec 29, 2025

autosubmit label was removed for flutter/flutter/180138, because - The status or check suite Windows tool_integration_tests_2_9 has failed. Please fix the issues identified (or deflake) before re-applying this label.

@walley892 walley892 added the autosubmit Merge PR when tree becomes green via auto submit App label Dec 30, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Dec 30, 2025
Merged via the queue into flutter:master with commit 560cb50 Dec 30, 2025
183 checks passed
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Dec 30, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 31, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Dec 31, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 1, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 1, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 2, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 2, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 2, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 3, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 3, 2026
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 4, 2026
Roll Flutter from 60d8165 to 13b2b91 (34 revisions)

flutter/flutter@60d8165...13b2b91

2026-01-03 engine-flutter-autoroll@skia.org Roll Skia from 229239fde9e9 to 2f257bbea23a (1 revision) (flutter/flutter#180461)
2026-01-03 engine-flutter-autoroll@skia.org Roll Dart SDK from be125a188f41 to 8e711d05b844 (1 revision) (flutter/flutter#180460)
2026-01-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 0e6419d14382 to be125a188f41 (1 revision) (flutter/flutter#180454)
2026-01-02 engine-flutter-autoroll@skia.org Roll Dart SDK from 5e4b7dc3a134 to 0e6419d14382 (4 revisions) (flutter/flutter#180449)
2026-01-02 engine-flutter-autoroll@skia.org Roll Skia from 5a8d480365e2 to 229239fde9e9 (9 revisions) (flutter/flutter#180448)
2026-01-02 47866232+chunhtai@users.noreply.github.com Relands "Feat: Add a11y for loading indicators (#165173)" (flutter/flutter#178402)
2026-01-02 bungeman@chromium.org Add SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS to SkUserConfig.h (flutter/flutter#180443)
2026-01-02 jmccandless@google.com Some cleanup of cross library test imports (flutter/flutter#177029)
2026-01-02 engine-flutter-autoroll@skia.org Roll Dart SDK from df175c998021 to 5e4b7dc3a134 (1 revision) (flutter/flutter#180366)
2026-01-02 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from nzgy72aZ9kvHxTDM6... to 1pPgo5DrQ5ITdz3Uy... (flutter/flutter#180438)
2026-01-01 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 23suNuzNQCwRbDrys... to nzgy72aZ9kvHxTDM6... (flutter/flutter#180424)
2025-12-31 srawlins@google.com Remove @OverRide annotations from things which are not overrides (flutter/flutter#180417)
2025-12-31 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from t1eBl_kzKGV5K28OU... to 23suNuzNQCwRbDrys... (flutter/flutter#180409)
2025-12-31 engine-flutter-autoroll@skia.org Roll Skia from 8851d5318c9d to 5a8d480365e2 (1 revision) (flutter/flutter#180400)
2025-12-31 ahmedsameha1@gmail.com Make sure that a DecoratedBox doesn't crash in 0x0 environment (flutter/flutter#180329)
2025-12-31 engine-flutter-autoroll@skia.org Roll Skia from d0e12d575173 to 8851d5318c9d (2 revisions) (flutter/flutter#180399)
2025-12-31 iliyazelenkog@gmail.com Improve Container color/decoration error message clarity (flutter/flutter#178823)
2025-12-30 ahmedsameha1@gmail.com Make sure that a CheckedModeBanner doesn't crash in 0x0 environment (flutter/flutter#180280)
2025-12-30 engine-flutter-autoroll@skia.org Roll Skia from 32c27424accb to d0e12d575173 (1 revision) (flutter/flutter#180394)
2025-12-30 dkwingsmt@users.noreply.github.com [Framework] iOS style blurring and `ImageFilterConfig` (flutter/flutter#175473)
2025-12-30 evanwall@buffalo.edu Fix issue with getUniformFloat crashing with hot reload (flutter/flutter#180138)
2025-12-30 jmccandless@google.com Test cross import lint (flutter/flutter#178693)
2025-12-30 engine-flutter-autoroll@skia.org Roll Skia from d64da765cee6 to 32c27424accb (1 revision) (flutter/flutter#180393)
2025-12-30 engine-flutter-autoroll@skia.org Roll Skia from 4c438e0537fc to d64da765cee6 (1 revision) (flutter/flutter#180390)
2025-12-30 engine-flutter-autoroll@skia.org Roll Packages from b3c3ca8 to 30dd810 (1 revision) (flutter/flutter#180388)
2025-12-30 engine-flutter-autoroll@skia.org Roll Skia from 27b587c4b160 to 4c438e0537fc (1 revision) (flutter/flutter#180384)
2025-12-30 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from DdllqZRZYriOd7Q8v... to t1eBl_kzKGV5K28OU... (flutter/flutter#180378)
2025-12-30 engine-flutter-autoroll@skia.org Roll Skia from 11690456a90d to 27b587c4b160 (1 revision) (flutter/flutter#180377)
2025-12-30 evanwall@buffalo.edu Allow setting vector uniforms by name. (flutter/flutter#179927)
2025-12-30 engine-flutter-autoroll@skia.org Roll Skia from 7abf754bce14 to 11690456a90d (6 revisions) (flutter/flutter#180374)
2025-12-29 logic@deltaq.org Add support for Shift-Delete, Ctrl-Insert and Shift-Insert (flutter/flutter#178561)
2025-12-29 engine-flutter-autoroll@skia.org Roll Skia from c85d3e2b12d7 to 7abf754bce14 (1 revision) (flutter/flutter#180371)
2025-12-29 engine-flutter-autoroll@skia.org Roll Packages from 2164da9 to b3c3ca8 (2 revisions) (flutter/flutter#180365)
2025-12-29 engine-flutter-autoroll@skia.org Roll Skia from c29a475066f5 to c85d3e2b12d7 (1 revision) (flutter/flutter#180363)

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 stuartmorgan@google.com 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

...
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

engine flutter/engine related. See also e: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Application crashed on hotreload when renaming uniforms and using getUniformFloat

2 participants