From 511a9d49998ec6a74c375e6cfc55f660f7987c40 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 27 Oct 2017 15:55:31 -0400 Subject: Fix GrDefaultPathRender inversely wound path bug Bug: 769898 Change-Id: I3b1a43b1e114b35105493a0cfa01a1f01b65fa56 Reviewed-on: https://skia-review.googlesource.com/64065 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- tests/Test.h | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) (limited to 'tests/Test.h') diff --git a/tests/Test.h b/tests/Test.h index c9a381eb12..7ef29325b7 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -22,6 +22,7 @@ class ContextInfo; class GLTestContext; } // namespace sk_gpu_test class GrContext; +class GrContextOptions; #endif namespace skiatest { @@ -89,12 +90,21 @@ private: }; typedef void (*TestProc)(skiatest::Reporter*, sk_gpu_test::GrContextFactory*); +typedef void (*ContextOptionsProc)(GrContextOptions*); struct Test { - Test(const char* n, bool g, TestProc p) : name(n), needsGpu(g), proc(p) {} + Test(const char* n, bool g, TestProc p, ContextOptionsProc optionsProc = nullptr) + : name(n), needsGpu(g), proc(p), fContextOptionsProc(optionsProc) {} 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*/); @@ -200,31 +210,36 @@ 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) \ - 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, \ +#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, \ 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) + DEF_GPUTEST_FOR_CONTEXTS(name, nullptr, reporter, context_info, nullptr) + #define DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name, reporter, context_info) \ DEF_GPUTEST_FOR_CONTEXTS(name, sk_gpu_test::GrContextFactory::IsRenderingContext, \ - reporter, context_info) + reporter, context_info, nullptr) #define DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsGLContextType, reporter, context_info) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsGLContextType, \ + reporter, context_info, nullptr) #define DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsRenderingGLContextType, reporter, context_info) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsRenderingGLContextType, \ + reporter, context_info, nullptr) #define DEF_GPUTEST_FOR_NULLGL_CONTEXT(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsNullGLContextType, reporter, context_info) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsNullGLContextType, \ + reporter, context_info, nullptr) #define DEF_GPUTEST_FOR_VULKAN_CONTEXT(name, reporter, context_info) \ - DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsVulkanContextType, reporter, context_info) + DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsVulkanContextType, \ + reporter, context_info, nullptr) #define REQUIRE_PDF_DOCUMENT(TEST_NAME, REPORTER) \ do { \ -- cgit v1.2.3