One signature for creating unit tests that run on premade GrContexts

tests/Test.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
 #include "SkString.h"
 #include "SkTRegistry.h"
 #include "SkTypes.h"
 
+#if SK_SUPPORT_GPU
+#include "GrContextFactory.h"
+#else
 namespace sk_gpu_test {
 class GrContextFactory;
+class ContextInfo;
 class GLTestContext;
 }  // namespace sk_gpu_test
 class GrContext;
+#endif
 
 namespace skiatest {
 
 SkString GetTmpDir();
 
 struct Failure {
     Failure(const char* f, int l, const char* c, const SkString& m)
         : fileName(f), lineNo(l), condition(c), message(m) {}
     const char* fileName;
     int lineNo;
@@ skipping 47 matching lines @@
     kNone_GPUTestContexts         = 0,
     kNull_GPUTestContexts         = 1,
     kDebug_GPUTestContexts        = 1 << 1,
     kNative_GPUTestContexts       = 1 << 2,
     kOther_GPUTestContexts        = 1 << 3, // Other than native, used only for below.
     kAllRendering_GPUTestContexts = kNative_GPUTestContexts | kOther_GPUTestContexts,
     kAll_GPUTestContexts          = kAllRendering_GPUTestContexts
                                        | kNull_GPUTestContexts
                                        | kDebug_GPUTestContexts
 };
-template<typename T>
-void RunWithGPUTestContexts(T testFunction, GPUTestContexts contexts, Reporter* reporter,
-                            sk_gpu_test::GrContextFactory* factory);
+
+typedef void GrContextTestFn(Reporter*, const sk_gpu_test::ContextInfo&);
+
+void RunWithGPUTestContexts(GrContextTestFn* testFunction, GPUTestContexts contexts,
+                            Reporter* reporter, sk_gpu_test::GrContextFactory* factory);
 
 /** Timer provides wall-clock duration since its creation. */
 class Timer {
 public:
     /** Starts the timer. */
     Timer();
 
     /** Nanoseconds since creation. */
     double elapsedNs() const;
 
@@ skipping 35 matching lines @@
             SkDebugf(__VA_ARGS__);   \
         }                            \
     } while (0)
 
 #define DEF_TEST(name, reporter)                                                  \
     static void test_##name(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); \
     skiatest::TestRegistry name##TestRegistry(                                    \
             skiatest::Test(#name, false, test_##name));                           \
     void test_##name(skiatest::Reporter* reporter, sk_gpu_test::GrContextFactory*)
 
-#define GPUTEST_EXPAND_MSVC(x) x
-#define GPUTEST_APPLY(C, ...) GPUTEST_EXPAND_MSVC(C(__VA_ARGS__))
-#define GPUTEST_SELECT(a1, a2, N, ...) N
 
-#define GPUTEST_CONTEXT_ARGS1(a1) GrContext* a1
-#define GPUTEST_CONTEXT_ARGS2(a1, a2) GrContext* a1, sk_gpu_test::GLTestContext* a2
-#define GPUTEST_CONTEXT_ARGS(...)                                                            \
-    GPUTEST_APPLY(GPUTEST_SELECT(__VA_ARGS__, GPUTEST_CONTEXT_ARGS2, GPUTEST_CONTEXT_ARGS1), \
-                  __VA_ARGS__)
-
-#define DEF_GPUTEST(name, reporter, factory)                                      \
-    static void test_##name(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); \
-    skiatest::TestRegistry name##TestRegistry(                                    \
-            skiatest::Test(#name, true, test_##name));                            \
+#define DEF_GPUTEST(name, reporter, factory)                                                 \
+    static void test_##name(skiatest::Reporter*, sk_gpu_test::GrContextFactory*);            \
+    skiatest::TestRegistry name##TestRegistry(                                               \
+            skiatest::Test(#name, true, test_##name));                                       \
     void test_##name(skiatest::Reporter* reporter, sk_gpu_test::GrContextFactory* factory)
 
-#define DEF_GPUTEST_FOR_CONTEXTS(name, contexts, reporter, ...)                      \
-    static void test_##name(skiatest::Reporter*, GPUTEST_CONTEXT_ARGS(__VA_ARGS__)); \
-    static void test_gpu_contexts_##name(skiatest::Reporter* reporter,               \
-                                         sk_gpu_test::GrContextFactory* factory) {   \
-        skiatest::RunWithGPUTestContexts(test_##name, contexts, reporter, factory);  \
-    }                                                                                \
-    skiatest::TestRegistry name##TestRegistry(                                       \
-            skiatest::Test(#name, true, test_gpu_contexts_##name));                  \
-    void test_##name(skiatest::Reporter* reporter, GPUTEST_CONTEXT_ARGS(__VA_ARGS__))
+#define DEF_GPUTEST_FOR_CONTEXTS(name, contexts, reporter, context_info)            \
+    static void test_##name(skiatest::Reporter*,                                    \
+                            const sk_gpu_test::ContextInfo& context_info);          \
+    static void test_gpu_contexts_##name(skiatest::Reporter* reporter,              \
+                                         sk_gpu_test::GrContextFactory* factory) {  \
+        skiatest::RunWithGPUTestContexts(test_##name, contexts, reporter, factory); \
+    }                                                                               \
+    skiatest::TestRegistry name##TestRegistry(                                      \
+            skiatest::Test(#name, true, test_gpu_contexts_##name));                 \
+    void test_##name(skiatest::Reporter* reporter,                                  \
+                     const sk_gpu_test::ContextInfo& context_info)
 
-#define DEF_GPUTEST_FOR_ALL_CONTEXTS(name, reporter, ...) \
-        DEF_GPUTEST_FOR_CONTEXTS(name, skiatest::kAll_GPUTestContexts, reporter, __VA_ARGS__)
-#define DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name, reporter, ...) \
-        DEF_GPUTEST_FOR_CONTEXTS(name, skiatest::kAllRendering_GPUTestContexts, reporter, __VA_ARGS__)
-#define DEF_GPUTEST_FOR_NULL_CONTEXT(name, reporter, ...) \
-        DEF_GPUTEST_FOR_CONTEXTS(name, skiatest::kNull_GPUTestContexts, reporter, __VA_ARGS__)
+#define DEF_GPUTEST_FOR_ALL_CONTEXTS(name, reporter, context_info)                              \
+        DEF_GPUTEST_FOR_CONTEXTS(name, skiatest::kAll_GPUTestContexts, reporter, context_info)
+#define DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name, reporter, context_info)                        \
+        DEF_GPUTEST_FOR_CONTEXTS(name, skiatest::kAllRendering_GPUTestContexts, reporter,       \
+                                 context_info)
+#define DEF_GPUTEST_FOR_NULL_CONTEXT(name, reporter, context_info)                              \
+        DEF_GPUTEST_FOR_CONTEXTS(name, skiatest::kNull_GPUTestContexts, reporter, context_info)
 
 #define REQUIRE_PDF_DOCUMENT(TEST_NAME, REPORTER)                             \
     do {                                                                      \
         SkDynamicMemoryWStream testStream;                                    \
         SkAutoTUnref<SkDocument> testDoc(SkDocument::CreatePDF(&testStream)); \
         if (!testDoc) {                                                       \
             INFOF(REPORTER, "PDF disabled; %s test skipped.", #TEST_NAME);    \
             return;                                                           \
         }                                                                     \
     } while (false)
 
 #endif