moved check higher in the stack

Author: gaaclarke

impeller/aiks/aiks_unittests.cc

@@ -937,22 +937,8 @@ TEST_P(AiksTest, CanDrawPaintMultipleTimes) {
   ASSERT_TRUE(OpenPlaygroundHere(canvas.EndRecordingAsPicture()));
 }
 
-namespace {
-bool DoesSupportWideGamutTests() {
-#ifdef __arm64__
-  return true;
-#else
-  return false;
-#endif
-}
-}  // namespace
-
 // This makes sure the WideGamut named tests use 16bit float pixel format.
 TEST_P(AiksTest, FormatWideGamut) {
-  if (!(GetParam() == PlaygroundBackend::kMetal &&
-        DoesSupportWideGamutTests())) {
-    GTEST_SKIP_("This backend doesn't yet support wide gamut.");
-  }
   EXPECT_EQ(GetContext()->GetCapabilities()->GetDefaultColorFormat(),
             PixelFormat::kB10G10R10A10XR);
   EXPECT_TRUE(IsAlphaClampedToOne(
@@ -3118,11 +3104,6 @@ TEST_P(AiksTest, MipmapGenerationWorksCorrectly) {
 }
 
 TEST_P(AiksTest, DrawAtlasPlusWideGamut) {
-  if (!(GetParam() == PlaygroundBackend::kMetal &&
-        DoesSupportWideGamutTests())) {
-    GTEST_SKIP_("This backend doesn't yet support wide gamut.");
-  }
-
   EXPECT_EQ(GetContext()->GetCapabilities()->GetDefaultColorFormat(),
             PixelFormat::kB10G10R10A10XR);
 

impeller/playground/backend/metal/playground_impl_mtl.mm

@@ -73,6 +73,7 @@
   if (!window) {
     return;
   }
+
   auto context = ContextMTL::Create(
       ShaderLibraryMappingsForPlayground(), is_gpu_disabled_sync_switch_,
       "Playground Library",

impeller/playground/playground_test.cc

@@ -15,6 +15,16 @@ PlaygroundTest::PlaygroundTest()
 
 PlaygroundTest::~PlaygroundTest() = default;
 
+namespace {
+bool DoesSupportWideGamutTests() {
+#ifdef __arm64__
+  return true;
+#else
+  return false;
+#endif
+}
+}  // namespace
+
 void PlaygroundTest::SetUp() {
   if (!Playground::SupportsBackend(GetParam())) {
     GTEST_SKIP_("Playground doesn't support this backend type.");
@@ -34,6 +44,12 @@ void PlaygroundTest::SetUp() {
   switches.enable_wide_gamut =
       test_name.find("WideGamut/") != std::string::npos;
 
+  if (switches.enable_wide_gamut && (GetParam() != PlaygroundBackend::kMetal ||
+                                     !DoesSupportWideGamutTests())) {
+    GTEST_SKIP_("This backend doesn't yet support wide gamut.");
+    return;
+  }
+
   SetupContext(GetParam(), switches);
   SetupWindow();
 }