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

Add support for the Metal backend on all iOS builds. #17080

Merged
merged 1 commit into from
Mar 11, 2020
Merged
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ def get_out_dir(args):
if args.enable_vulkan:
target_dir.append('vulkan')

if args.enable_metal and args.target_os == 'ios':
target_dir.append('metal')

return os.path.join(args.out_dir, 'out', '_'.join(target_dir))

def to_command_line(gn_args):
Expand Down Expand Up @@ -219,17 +216,18 @@ def to_gn_args(args):
gn_args['use_goma'] = False
gn_args['goma_dir'] = None

if args.enable_metal:
gn_args['skia_use_metal'] = True
gn_args['shell_enable_metal'] = True
gn_args['allow_deprecated_api_calls'] = True

if args.enable_vulkan:
# Enable vulkan in the Flutter shell.
gn_args['shell_enable_vulkan'] = True
# Configure Skia for Vulkan support.
gn_args['skia_use_vulkan'] = True

# Enable Metal on non-simulator iOS builds.
if args.target_os == 'ios':
gn_args['skia_use_metal'] = not args.simulator
gn_args['shell_enable_metal'] = not args.simulator
gn_args['allow_deprecated_api_calls'] = not args.simulator

# The buildroot currently isn't set up to support Vulkan in the
# Windows ANGLE build, so disable it regardless of enable_vulkan's value.
if sys.platform.startswith(('cygwin', 'win')):
Expand Down