This repository was archived by the owner on Feb 25, 2025. It is now read-only.
[Windows] Fix EGL surface destruction race #51781
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
matanlurey
added
the
warning: land on red to fix tree breakage
matanlurey
approved these changes
Mar 29, 2024
yaakovschectman
approved these changes
Mar 29, 2024
| fml::AutoResetWaitableEvent latch; | ||
| engine.PostRasterThreadTask([&]() { | ||
| surface.Destroy(); | ||
| latch.Signal(); |
There was a problem hiding this comment.
What does this latch accomplish? Does this prevent the engine from destructing before this task runs?
There was a problem hiding this comment.
Good question. This runs in the FlutterWindowsView destructor, which owns the std::unique<egl::WindowSurface>. The latch forced the destructor to wait until the surface was destroyed.
A cleaner version would be to just move the surface's ownership to the raster thread. I've updated it to that insead!
loic-sharma
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Mar 29, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Mar 30, 2024
…146020) flutter/engine@8ec35b6...0a75166 2024-03-29 skia-flutter-autoroll@skia.org Roll Skia from a12e40efacea to df005a80da32 (1 revision) (flutter/engine#51777) 2024-03-29 737941+loic-sharma@users.noreply.github.com [Windows] Fix EGL surface destruction race (flutter/engine#51781) 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 jacksongardner@google.com,rmistry@google.com,zra@google.com 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.
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.
This fixes the
WindowsTest.EngineCanTransitionToHeadlessflakiness reported by @matanlurey.EGL surfaces can only be used by a single thread at a time. Concurrent operations are unsafe.
Previously, the EGL surface was destroyed on the platform thread. This was safe as this always happened after the engine was shutdown and the raster thread was stopped. However, in a multi-view world a view can be destroyed while the engine is running. There may be pending raster tasks that operate on the render surface. Thus, the EGL surfaces should be destroyed on the raster thread when it is available.
This bug was introduced by #51681
Part of flutter/flutter#142845
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.