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

Jump to bottom

Reland "Add support for the Metal backend on all iOS builds." #17191

Merged
merged 1 commit into from
Mar 18, 2020
Merged

Reland "Add support for the Metal backend on all iOS builds." #17191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions tools/gn
View file
Open in desktop
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,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

# 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