commit 2811aa25f1f7c5f5b31eb0cb7dabcbab90d9709d
author Greg Daniel <egdaniel@google.com> Thu Jul 13 15:34:56 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 14 13:57:34 2017 +0000
tree 111bab3158f83a86bac66edeefc4ad8d5c081483
parent f99a1739be4e7dec67a0b7e6e008c6999b139cee

Add metal config to tools

Bug: skia:
Change-Id: I84dbd56c17d4856496af4491f340ec560e29c8a6
Reviewed-on: https://skia-review.googlesource.com/23200
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tests/TestConfigParsing.cpp

diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index ca91f5b..6a2607a 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -118,7 +118,8 @@
         "glwide",
         "glnarrow",
         "glnostencils",
-        "mock"
+        "mock",
+        "mtl"
     });
 
     SkCommandLineConfigArray configs;
@@ -259,6 +260,7 @@
         "gpu[api=gles]",
         "gpu[api=gl]",
         "gpu[api=vulkan]",
+        "gpu[api=metal]",
         "gpu[api=mock]",
     });
 
@@ -305,7 +307,14 @@
     REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 0);
 #endif
+#ifdef SK_METAL
     REPORTER_ASSERT(reporter, configs[8]->asConfigGpu()->getContextType() ==
+                              GrContextFactory::kMetal_ContextType);
+    REPORTER_ASSERT(reporter, !configs[8]->asConfigGpu()->getUseNVPR());
+    REPORTER_ASSERT(reporter, !configs[8]->asConfigGpu()->getUseDIText());
+    REPORTER_ASSERT(reporter, configs[8]->asConfigGpu()->getSamples() == 0);
+#endif
+    REPORTER_ASSERT(reporter, configs[9]->asConfigGpu()->getContextType() ==
                    GrContextFactory::kMock_ContextType);
 #endif
 }