Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Impeller] delete Impeller sim opt out. #56706

Merged
merged 13 commits into from
Nov 22, 2024
Merged

[Impeller] delete Impeller sim opt out. #56706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ca78e01
[Impeller] delete Impeller sim opt out.
jonahwilliams Nov 19, 2024
764e3f4
Update settings.h
jonahwilliams Nov 19, 2024
746dcb5
Merge branch 'main' into remove_sim_opt_out
jonahwilliams Nov 19, 2024
15b12f9
actually fix.
jonahwilliams Nov 19, 2024
d3e90e0
Merge branch 'remove_sim_opt_out' of github.com:jonahwilliams/engine …
jonahwilliams Nov 19, 2024
aef4ca4
update test.
jonahwilliams Nov 19, 2024
3f51b65
++
jonahwilliams Nov 20, 2024
bc95e18
delete --with-skia.
jonahwilliams Nov 20, 2024
96d4ee7
Merge branch 'main' into remove_sim_opt_out
jonahwilliams Nov 22, 2024
0262a62
Merge branch 'main' into remove_sim_opt_out
jonahwilliams Nov 22, 2024
8ff45d9
delete tests.
jonahwilliams Nov 22, 2024
d9418a6
Merge branch 'remove_sim_opt_out' of github.com:jonahwilliams/engine …
jonahwilliams Nov 22, 2024
48e7b11
Update FlutterDartProjectTest.mm
jonahwilliams Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ struct Settings {
#if FML_OS_ANDROID || FML_OS_IOS || FML_OS_IOS_SIMULATOR
// On iOS devices, Impeller is the default with no opt-out and this field is
// const.
#if FML_OS_IOS && !FML_OS_IOS_SIMULATOR
#if FML_OS_IOS && FML_OS_IOS_SIMULATOR
Copy link
Member

Choose a reason for hiding this comment

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

Should this be || and not && ?

Copy link
Member Author

Choose a reason for hiding this comment

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

....yes

static constexpr const
#endif // FML_OS_IOS && !FML_OS_IOS_SIMULATOR
bool enable_impeller = true;
Expand Down
15 changes: 0 additions & 15 deletions shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,21 +177,6 @@ static BOOL DoesHardwareSupportWideGamut() {
settings.enable_wide_gamut = enableWideGamut;
#endif

#if FML_OS_IOS_SIMULATOR
if (!command_line.HasOption("enable-impeller")) {
// Next, look in the app bundle.
NSNumber* enableImpeller = [bundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
if (enableImpeller == nil) {
// If it isn't in the app bundle, look in the main bundle.
enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"];
}
// Change the default only if the option is present.
if (enableImpeller != nil) {
settings.enable_impeller = enableImpeller.boolValue;
}
}
#endif // FML_OS_IOS_SIMULATOR

settings.warn_on_impeller_opt_out = true;

NSNumber* enableTraceSystrace = [mainBundle objectForInfoDictionaryKey:@"FLTTraceSystrace"];
Expand Down