Disable MTLPixelFormatBGR10A2Unorm on iOS

This is a bit overkill. Support for BGR10_A2 was added in iOS 11 but we support iOS 9 and up.

Bug: skia:10195
Bug: 1068416
Change-Id: I0b66c3ac676ef14d5bc2c7fcf194047b51017e83
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/286878
Commit-Queue: Robert Phillips <[email protected]>
Reviewed-by: Jim Van Verth <[email protected]>

Author: rphilli

src/gpu/mtl/GrMtlCaps.h

@@ -156,7 +156,7 @@ class GrMtlCaps : public GrCaps {
         int fColorTypeInfoCount = 0;
     };
 #ifdef SK_BUILD_FOR_IOS
-    static constexpr size_t kNumMtlFormats = 18;
+    static constexpr size_t kNumMtlFormats = 17;
 #else
     static constexpr size_t kNumMtlFormats = 16;
 #endif

src/gpu/mtl/GrMtlCaps.mm

@@ -469,7 +469,10 @@ static bool format_is_srgb(MTLPixelFormat format) {
     MTLPixelFormatR16Float,
     MTLPixelFormatRG8Unorm,
     MTLPixelFormatRGB10A2Unorm,
+#ifdef SK_BUILD_FOR_MAC
+    // BGR10_A2 wasn't added until iOS 11
     MTLPixelFormatBGR10A2Unorm,
+#endif
 #ifdef SK_BUILD_FOR_IOS
     MTLPixelFormatABGR4Unorm,
 #endif
@@ -698,6 +701,7 @@ static bool format_is_srgb(MTLPixelFormat format) {
         }
     }
 
+#ifdef SK_BUILD_FOR_MAC
     // Format: BGR10A2Unorm
     {
         info = &fFormatTable[GetFormatIndex(MTLPixelFormatBGR10A2Unorm)];
@@ -717,6 +721,7 @@ static bool format_is_srgb(MTLPixelFormat format) {
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
         }
     }
+#endif
 
     // Format: R16Float
     {
@@ -867,7 +872,9 @@ static bool format_is_srgb(MTLPixelFormat format) {
     this->setColorType(GrColorType::kRG_88,            { MTLPixelFormatRG8Unorm });
     this->setColorType(GrColorType::kBGRA_8888,        { MTLPixelFormatBGRA8Unorm });
     this->setColorType(GrColorType::kRGBA_1010102,     { MTLPixelFormatRGB10A2Unorm });
+#ifdef SK_BUILD_FOR_MAC
     this->setColorType(GrColorType::kBGRA_1010102,     { MTLPixelFormatBGR10A2Unorm });
+#endif
     this->setColorType(GrColorType::kGray_8,           { MTLPixelFormatR8Unorm });
     this->setColorType(GrColorType::kAlpha_F16,        { MTLPixelFormatR16Float });
     this->setColorType(GrColorType::kRGBA_F16,         { MTLPixelFormatRGBA16Float });
@@ -1094,7 +1101,9 @@ static bool format_is_srgb(MTLPixelFormat format) {
         { GrColorType::kRG_88,            GrBackendFormat::MakeMtl(MTLPixelFormatRG8Unorm)        },
         { GrColorType::kBGRA_8888,        GrBackendFormat::MakeMtl(MTLPixelFormatBGRA8Unorm)      },
         { GrColorType::kRGBA_1010102,     GrBackendFormat::MakeMtl(MTLPixelFormatRGB10A2Unorm)    },
+#ifdef SK_BUILD_FOR_MAC
         { GrColorType::kBGRA_1010102,     GrBackendFormat::MakeMtl(MTLPixelFormatBGR10A2Unorm)    },
+#endif
         { GrColorType::kGray_8,           GrBackendFormat::MakeMtl(MTLPixelFormatR8Unorm)         },
         { GrColorType::kAlpha_F16,        GrBackendFormat::MakeMtl(MTLPixelFormatR16Float)        },
         { GrColorType::kRGBA_F16,         GrBackendFormat::MakeMtl(MTLPixelFormatRGBA16Float)     },

src/gpu/mtl/GrMtlGpu.mm

@@ -741,7 +741,9 @@ static GrColorType mtl_format_to_backend_tex_clear_colortype(MTLPixelFormat form
         case MTLPixelFormatRG8Unorm:        return GrColorType::kRG_88;
         case MTLPixelFormatBGRA8Unorm:      return GrColorType::kBGRA_8888;
         case MTLPixelFormatRGB10A2Unorm:    return GrColorType::kRGBA_1010102;
+#ifdef SK_BUILD_FOR_MAC
         case MTLPixelFormatBGR10A2Unorm:    return GrColorType::kBGRA_1010102;
+#endif
         case MTLPixelFormatR16Float:        return GrColorType::kR_F16;
         case MTLPixelFormatRGBA16Float:     return GrColorType::kRGBA_F16;
         case MTLPixelFormatR16Unorm:        return GrColorType::kR_16;

src/gpu/mtl/GrMtlUtil.mm

@@ -248,7 +248,9 @@ uint32_t GrMtlFormatChannels(GrMTLPixelFormat mtlFormat) {
         case MTLPixelFormatR16Float:        return kRed_SkColorChannelFlag;
         case MTLPixelFormatRG8Unorm:        return kRG_SkColorChannelFlags;
         case MTLPixelFormatRGB10A2Unorm:    return kRGBA_SkColorChannelFlags;
+#ifdef SK_BUILD_FOR_MAC
         case MTLPixelFormatBGR10A2Unorm:    return kRGBA_SkColorChannelFlags;
+#endif
 #if defined(SK_BUILD_FOR_IOS) && !TARGET_OS_SIMULATOR
         case MTLPixelFormatABGR4Unorm:      return kRGBA_SkColorChannelFlags;
 #endif
@@ -313,7 +315,9 @@ bool GrMtlFormatIsBGRA8(GrMTLPixelFormat mtlFormat) {
         case MTLPixelFormatR16Float:        return "R16Float";
         case MTLPixelFormatRG8Unorm:        return "RG8Unorm";
         case MTLPixelFormatRGB10A2Unorm:    return "RGB10A2Unorm";
+#ifdef SK_BUILD_FOR_MAC
         case MTLPixelFormatBGR10A2Unorm:    return "BGR10A2Unorm";
+#endif
 #ifdef SK_BUILD_FOR_IOS
         case MTLPixelFormatABGR4Unorm:      return "ABGR4Unorm";
 #endif

tests/MtlBackendAllocationTest.mm

@@ -51,8 +51,10 @@ void test_color_init(GrContext* context, skiatest::Reporter* reporter,
 
         { GrColorType::kRGBA_1010102,     MTLPixelFormatRGB10A2Unorm,
                                                                     { 0.25f, 0.5f, 0.75f, 1.0f } },
+#ifdef SK_BUILD_FOR_MAC
         { GrColorType::kBGRA_1010102,     MTLPixelFormatBGR10A2Unorm,
                                                                     { 0.25f, 0.5f, 0.75f, 1.0f } },
+#endif
 #ifdef SK_BUILD_FOR_IOS
         { GrColorType::kBGR_565,          MTLPixelFormatB5G6R5Unorm,     SkColors::kRed       },
         { GrColorType::kABGR_4444,        MTLPixelFormatABGR4Unorm,      SkColors::kGreen     },