diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-10-30 15:55:56 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-30 15:58:03 +0000 |
| commit | fc28138c0422637741ac2839914ef10c56438054 (patch) | |
| tree | 1a3ada623132a4fe9fcbd1853914e6aa3aef0555 /tests/Test.h | |
| parent | dd992c4a461040e798a02cba028e55cdcd856026 (diff) | |
Revert "Fix GrDefaultPathRender inversely wound path bug"
This reverts commit 511a9d49998ec6a74c375e6cfc55f660f7987c40.
Reason for revert: vulkan
Original change's description:
> Fix GrDefaultPathRender inversely wound path bug
>
> Bug: 769898
> Change-Id: I3b1a43b1e114b35105493a0cfa01a1f01b65fa56
> Reviewed-on: https://skia-review.googlesource.com/64065
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: Ib1a987294d14f0526bf5ff5a8fd90bbd5f6f3a0d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 769898
Reviewed-on: https://skia-review.googlesource.com/65201
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/Test.h')
| -rw-r--r-- | tests/Test.h | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/tests/Test.h b/tests/Test.h index 7ef29325b7..c9a381eb12 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -22,7 +22,6 @@ class ContextInfo; class GLTestContext; } // namespace sk_gpu_test class GrContext; -class GrContextOptions; #endif namespace skiatest { @@ -90,21 +89,12 @@ private: }; typedef void (*TestProc)(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); -typedef void (*ContextOptionsProc)(GrContextOptions*); struct Test { - Test(const char* n, bool g, TestProc p, ContextOptionsProc optionsProc = nullptr) - : name(n), needsGpu(g), proc(p), fContextOptionsProc(optionsProc) {} + Test(const char* n, bool g, TestProc p) : name(n), needsGpu(g), proc(p) {} const char* name; bool needsGpu; TestProc proc; - ContextOptionsProc fContextOptionsProc; - - void modifyGrContextOptions(GrContextOptions* options) { - if (fContextOptionsProc) { - (*fContextOptionsProc)(options); - } - } void run(skiatest::Reporter* r, sk_gpu_test::GrContextFactory* factory) const { TRACE_EVENT1("test", TRACE_FUNC, "name", this->name/*these are static*/); @@ -210,36 +200,31 @@ private: skiatest::Test(#name, true, test_##name)); \ void test_##name(skiatest::Reporter* reporter, sk_gpu_test::GrContextFactory* factory) -#define DEF_GPUTEST_FOR_CONTEXTS(name, context_filter, reporter, context_info, options_filter) \ - 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, context_filter, reporter, factory); \ - } \ - skiatest::TestRegistry name##TestRegistry( \ - skiatest::Test(#name, true, test_gpu_contexts_##name, options_filter)); \ - void test_##name(skiatest::Reporter* reporter, \ +#define DEF_GPUTEST_FOR_CONTEXTS(name, context_filter, 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, context_filter, 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, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, nullptr, reporter, context_info, nullptr) - + DEF_GPUTEST_FOR_CONTEXTS(name, nullptr, reporter, context_info) #define DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name, reporter, context_info) \ DEF_GPUTEST_FOR_CONTEXTS(name, sk_gpu_test::GrContextFactory::IsRenderingContext, \ - reporter, context_info, nullptr) + reporter, context_info) #define DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsGLContextType, \ - reporter, context_info, nullptr) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsGLContextType, reporter, context_info) #define DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsRenderingGLContextType, \ - reporter, context_info, nullptr) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsRenderingGLContextType, reporter, context_info) #define DEF_GPUTEST_FOR_NULLGL_CONTEXT(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsNullGLContextType, \ - reporter, context_info, nullptr) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsNullGLContextType, reporter, context_info) #define DEF_GPUTEST_FOR_VULKAN_CONTEXT(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsVulkanContextType, \ - reporter, context_info, nullptr) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsVulkanContextType, reporter, context_info) #define REQUIRE_PDF_DOCUMENT(TEST_NAME, REPORTER) \ do { \ |