From 63618acc5c4fb4285723f89b0cc5c660b153a53c Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Thu, 19 Aug 2021 00:06:34 +0000 Subject: [PATCH] Revert "Remove maccatalyst available check." This reverts commit 69ae22db48d89fc728ed5ee78e95db1f4ee04c3e. Reason for revert: Flutter roll. Original change's description: > Remove maccatalyst available check. > > It's not strictly necessary and causes compile issues on early versions > of Xcode 12. > > Change-Id: I39b0b25184bdeb978a31bbede59283b0836751c2 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/440521 > Commit-Queue: Jim Van Verth > Commit-Queue: John Stiles > Auto-Submit: Jim Van Verth > Reviewed-by: John Stiles TBR=jvanverth@google.com,johnstiles@google.com,skcq-be@skia-corp.google.com.iam.gserviceaccount.com Change-Id: Iac537784aaa4135b49b01dbc22e0936919ae222c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/440542 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- src/gpu/mtl/GrMtlCaps.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpu/mtl/GrMtlCaps.mm b/src/gpu/mtl/GrMtlCaps.mm index 45a84292da..3bcfe67936 100644 --- a/src/gpu/mtl/GrMtlCaps.mm +++ b/src/gpu/mtl/GrMtlCaps.mm @@ -153,7 +153,7 @@ bool GrMtlCaps::getGPUFamilyFromFeatureSet(id device, bool GrMtlCaps::getGPUFamily(id device, GPUFamily* gpuFamily, int* group) { #if GR_METAL_SDK_VERSION >= 220 - if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) { + if (@available(macOS 10.15, iOS 13.0, macCatalyst 13.0, tvOS 13.0, *)) { // Apple Silicon #if GR_METAL_SDK_VERSION >= 230 if ([device supportsFamily:MTLGPUFamilyApple7]) {