Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reverts "Remove #if SHELL_ENABLE_METAL checks in iOS code (#51636)" #51941

Merged
merged 1 commit into from
Apr 5, 2024

Conversation

auto-submit[bot]
Copy link
Contributor

@auto-submit auto-submit bot commented Apr 5, 2024

Reverts: #51636

Initiated by: jmagman

Reason for reverting: This caused a slew of unexpected Scuba changes b/333039358

Original PR Author: jmagman

Reviewed By: {cbracken}

This change reverts the following previous change:
All physical iOS devices Flutter supports (iOS 12+) can run Metal. The only time Flutter doesn't use Metal afaik is for iOS simulators running < iOS 13, which is covered by a few if (@available(iOS METAL_IOS_VERSION_BASELINE, *)) checks.

#if TARGET_OS_SIMULATOR
#define METAL_IOS_VERSION_BASELINE 13.0
#else
#define METAL_IOS_VERSION_BASELINE 10.0
#endif // TARGET_OS_SIMULATOR

Remove hardware checks for physical devices.

Remove shell_enable_metal from the gn files and the #if SHELL_ENABLE_METAL checks in the iOS embedder.

I limited this PR to just iOS, but I imagine it's safe to remove shell_enable_metal everywhere?

enable_metal = shell_enable_metal

engine/tools/gn

Lines 673 to 679 in 41da00a

if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia']:
# OpenGL is deprecated on macOS > 10.11.
# This is not necessarily needed but enabling this until we have a way to
# build a macOS metal only shell and a gl only shell.
gn_args['allow_deprecated_api_calls'] = True
gn_args['skia_use_metal'] = True
gn_args['shell_enable_metal'] = True

@auto-submit auto-submit bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Apr 5, 2024
@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact "@test-exemption-reviewer" in the #hackers channel in Chat (don't just cc them here, they won't see it! Use Discord!).

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.

@jmagman jmagman requested a review from cbracken April 5, 2024 18:55
@auto-submit auto-submit bot merged commit 6a478d6 into main Apr 5, 2024
@auto-submit auto-submit bot deleted the revert_e3104af94328cbeadbb97db38d0bfd35daaaadcd branch April 5, 2024 18:55
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Apr 5, 2024
…146360)

flutter/engine@62df3bd...6a478d6

2024-04-05 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Remove #if SHELL_ENABLE_METAL checks in iOS code (#51636)" (flutter/engine#51941)
2024-04-05 [email protected] Roll Fuchsia Linux SDK from TAr6MCirveGvhZFHK... to EaKtmpePocJx6qaKg... (flutter/engine#51940)
2024-04-05 [email protected] Roll Skia from 6d673cafb8d1 to 0424e59d3a08 (1 revision) (flutter/engine#51939)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from TAr6MCirveGv to EaKtmpePocJx

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],[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
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
…lutter#146360)

flutter/engine@62df3bd...6a478d6

2024-04-05 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Remove #if SHELL_ENABLE_METAL checks in iOS code (flutter#51636)" (flutter/engine#51941)
2024-04-05 [email protected] Roll Fuchsia Linux SDK from TAr6MCirveGvhZFHK... to EaKtmpePocJx6qaKg... (flutter/engine#51940)
2024-04-05 [email protected] Roll Skia from 6d673cafb8d1 to 0424e59d3a08 (1 revision) (flutter/engine#51939)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from TAr6MCirveGv to EaKtmpePocJx

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],[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
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
platform-ios revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants