From da1929b38bcb8654b6bf2d2e87eed53be4509b3a Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Mon, 31 Jan 2022 14:57:21 -0800 Subject: [PATCH] Gate the minimum iOS deployment versions in the generated shaders. --- engine/src/flutter/impeller/renderer/allocator.cc | 2 +- engine/src/flutter/impeller/renderer/platform.h | 2 +- engine/src/flutter/impeller/tools/build_metal_library.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/impeller/renderer/allocator.cc b/engine/src/flutter/impeller/renderer/allocator.cc index fa4147141cf..5969d220c21 100644 --- a/engine/src/flutter/impeller/renderer/allocator.cc +++ b/engine/src/flutter/impeller/renderer/allocator.cc @@ -15,7 +15,7 @@ bool Allocator::RequiresExplicitHostSynchronization(StorageMode mode) { return false; } -#if FML_OS_IOS +#if OS_IOS // StorageMode::kHostVisible is MTLStorageModeShared already. return false; #else // OS_IOS diff --git a/engine/src/flutter/impeller/renderer/platform.h b/engine/src/flutter/impeller/renderer/platform.h index 1ca8133c328..464d47451ac 100644 --- a/engine/src/flutter/impeller/renderer/platform.h +++ b/engine/src/flutter/impeller/renderer/platform.h @@ -12,7 +12,7 @@ namespace impeller { constexpr size_t DefaultUniformAlignment() { -#if FML_OS_IOS +#if OS_IOS return 16u; #elif FML_OS_MACOSX return 256u; diff --git a/engine/src/flutter/impeller/tools/build_metal_library.py b/engine/src/flutter/impeller/tools/build_metal_library.py index ef4913f72a2..4e18d09e331 100644 --- a/engine/src/flutter/impeller/tools/build_metal_library.py +++ b/engine/src/flutter/impeller/tools/build_metal_library.py @@ -74,6 +74,7 @@ def Main(): elif args.platform == "ios": command += [ "--std=ios-metal1.2", + "-mios-version-min=10.0", ] if args.optimize: