This repository was archived by the owner on Feb 25, 2025. It is now read-only.
iOS: Refactor ShellTestPlatformViewMetal #56370
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
|
It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group. |
Migrates DarwinContextMetal to a plain C struct, eliminating the need for constructor, getters, etc. since it's only used in this translation unit. The fields themselves cannot be inlined as fields on ShellTestPlatformViewMetal because the header in which that class is defined is included in plain C++ (non-Obj-C++) translation units and therefore cannot contain Obj-C types. This simplifies the code and simultaneously fixes complicated ARC behaviour in which the const "DarwinContextMetal::context()" getter caused refcount to be incremented on the underlying context_ pointer, but not decremented even if never unassigned. In particular the line ```objc FML_CHECK([metal_context->context() mainContext])); ``` appeared to cause refcount to be incremented but never decremented. Regardless of the ARC issue, this significantly simplifies the code. This also eliminates the last remaining use of fml::scoped_nsobject in Flutter's codebase. That class will be removed in a followup PR. Issue: flutter/flutter#137801
cbracken
commented
Nov 5, 2024
| vsync_clock_(std::move(vsync_clock)), | ||
| shell_test_external_view_embedder_(std::move(shell_test_external_view_embedder)) { | ||
| if (GetSettings().enable_impeller) { | ||
| FML_CHECK([metal_context_->impeller_context() context] != nil); |
Member
Author
There was a problem hiding this comment.
[impeller_context context] and [skia_context context] here and below was an sk_sp, not a plain Obj-C pointer. I don't see any implicit type conversion operators defined in there but that type does implement operator bool() so using that instead for the sanity of readers.
cbracken
commented
Nov 5, 2024
| impeller ? [[FlutterDarwinContextMetalImpeller alloc] init:is_gpu_disabled_sync_switch] | ||
| : nil), | ||
| offscreen_texture_(CreateOffscreenTexture( | ||
| impeller ? [impeller_context_ context]->GetMTLDevice() : [context_ device])) {} |
Member
Author
There was a problem hiding this comment.
This is now done in the static CreateDarwinContext func above, which inlines CreateOffscreenTexture since it was only used here.
None of the rest of the getter boilerplate is necessary.
cbracken
commented
Nov 5, 2024
| // non-Objective-C TUs. | ||
| struct DarwinContextMetal { | ||
| FlutterDarwinContextMetalSkia* skia_context; | ||
| FlutterDarwinContextMetalImpeller* impeller_context; |
Member
Author
There was a problem hiding this comment.
Could this have been a union or std::variant? Yes. But we're going to delete the skia backend eventually anyway, so may as well avoid the extra complexity and make life easy on the person who deletes it.
stuartmorgan-g
approved these changes
Nov 5, 2024
Contributor
stuartmorgan-g
left a comment
stuartmorgan-g
left a comment
There was a problem hiding this comment.
LGTM
I agree this should be a std::variant instead, but also that adding the complexity at this point isn't warranted.
cbracken
added
the
autosubmit
Contributor
|
test-exempt: code refactor with no semantic change |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Nov 5, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Nov 5, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Nov 5, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Nov 5, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Nov 6, 2024
…158218) flutter/engine@e5e06c9...a3741d6 2024-11-05 [email protected] Increase timeouts for Linux Fuchsia and Linux Web Framework Tests builders (flutter/engine#56387) 2024-11-05 [email protected] iOS: Use standard Obj-C cflags for ios_test_flutter (flutter/engine#56384) 2024-11-05 [email protected] Remove unnecessary method for getting engine switches (command line). (flutter/engine#56265) 2024-11-05 [email protected] Remove FlScrollingViewDelegate (flutter/engine#56270) 2024-11-05 [email protected] fml: delete scoped_nsobject.h,mm (flutter/engine#56382) 2024-11-05 [email protected] Roll Skia from b3be9cb59fe8 to 82175b411c80 (2 revisions) (flutter/engine#56383) 2024-11-05 [email protected] [Impeller] Delete any remaining GL objects during destruction of the ReactorGLES (flutter/engine#56361) 2024-11-05 [email protected] [web] Switch all fonts to WOFF2 (non-split) (flutter/engine#56035) 2024-11-05 [email protected] [Impeller] exploit content context options' perfect hash function. (flutter/engine#56360) 2024-11-05 [email protected] Roll Skia from 7989f782dbf4 to b3be9cb59fe8 (6 revisions) (flutter/engine#56380) 2024-11-05 [email protected] Roll Dart SDK from b39c729740eb to 3e840340c412 (1 revision) (flutter/engine#56377) 2024-11-05 [email protected] [Impeller] match Skia's old VMA default block size. (flutter/engine#56368) 2024-11-05 [email protected] iOS: Refactor ShellTestPlatformViewMetal (flutter/engine#56370) 2024-11-05 [email protected] Roll Fuchsia Linux SDK from amgHXcqtplha8LuI_... to z1otZzn3yKuGnu1st... (flutter/engine#56374) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from amgHXcqtplha to z1otZzn3yKuG 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
nick9822
pushed a commit
to nick9822/flutter
that referenced
this pull request
Dec 18, 2024
Migrates DarwinContextMetal to a plain C struct, eliminating the need for constructor, getters, etc. since it's only used in this translation unit. The fields themselves cannot be inlined as fields on ShellTestPlatformViewMetal because the header in which that class is defined is included in plain C++ (non-Obj-C++) translation units and therefore cannot contain Obj-C types. This simplifies the code and simultaneously fixes complicated ARC behaviour in which the const "DarwinContextMetal::context()" getter caused retainCount to be incremented on the underlying context_ pointer, but not decremented even if never unassigned. In particular the line ```objc FML_CHECK([metal_context->context() mainContext])); ``` appeared to cause refcount to be incremented but never decremented. Regardless of the ARC issue, this significantly simplifies the code. This also eliminates the last remaining use of fml::scoped_nsobject in Flutter's codebase. That class will be removed in a followup PR. No test changes since there is no change to semantics. Issue: flutter#137801 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
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.
Migrates DarwinContextMetal to a plain C struct, eliminating the need for constructor, getters, etc. since it's only used in this translation unit. The fields themselves cannot be inlined as fields on ShellTestPlatformViewMetal because the header in which that class is defined is included in plain C++ (non-Obj-C++) translation units and therefore cannot contain Obj-C types.
This simplifies the code and simultaneously fixes complicated ARC behaviour in which the const "DarwinContextMetal::context()" getter caused retainCount to be incremented on the underlying context_ pointer, but not decremented even if never unassigned. In particular the line
appeared to cause refcount to be incremented but never decremented.
Regardless of the ARC issue, this significantly simplifies the code.
This also eliminates the last remaining use of fml::scoped_nsobject in Flutter's codebase. That class will be removed in a followup PR.
No test changes since there is no change to semantics.
Issue: flutter/flutter#137801
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.