Skip to content

Commit

Permalink
Revert "Add support for the Metal backend on all iOS builds. (#17080)" (
Browse files Browse the repository at this point in the history
#17088)

This reverts commit e8e0e0b.
  • Loading branch information
chinmaygarde committed Mar 11, 2020
1 parent c6aa4d2 commit ec2c624
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ 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 @@ -216,18 +219,17 @@ 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

0 comments on commit ec2c624

Please sign in to comment.