From ab7181daad5dae205b8dbd9de318aa3438a1cabf Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 14 May 2018 14:02:03 -0700 Subject: Reland "Add driver bug workarounds to GrCaps" This is a reland of 328490c6a1625ce51d0e81688e0c85c79c400d86 Original change's description: > Add driver bug workarounds to GrCaps > > This moves GrDriverBugWorkarounds to include so that it can be included > by GrCaps. This also makes GrContextOptions a nearly empty class in > the case of !SK_SUPPORT_GPU so that non-gpu builds don't need to build > in GrDriverBugWorkarounds.cpp. > > Bug: chromium: 829614 > Change-Id: Iedf73677fd09e9a487cfe618a696fd4b25c8703d > Reviewed-on: https://skia-review.googlesource.com/126581 > Reviewed-by: Brian Salomon > Commit-Queue: Adrienne Walker Bug: chromium: 829614 Change-Id: I7b539f99caa3032c8c595dd5068dc3b179747ccd Reviewed-on: https://skia-review.googlesource.com/127304 Commit-Queue: Adrienne Walker Reviewed-by: Brian Salomon --- dm/DMSrcSink.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 2936493363..52826ac00b 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1608,9 +1608,11 @@ Error GPUThreadTestingSink::draw(const Src& src, SkBitmap* dst, SkWStream* wStre // Also, force us to only use the software path renderer, so we really stress-test the threaded // version of that code. GrContextOptions contextOptions = this->baseContextOptions(); +#if SK_SUPPORT_GPU contextOptions.fGpuPathRenderers = GpuPathRenderers::kNone; - contextOptions.fExecutor = fExecutor.get(); +#endif + Error err = this->onDraw(src, dst, wStream, log, contextOptions); if (!err.isEmpty() || !dst) { return err; @@ -1619,7 +1621,9 @@ Error GPUThreadTestingSink::draw(const Src& src, SkBitmap* dst, SkWStream* wStre SkBitmap reference; SkString refLog; SkDynamicMemoryWStream refStream; +#if SK_SUPPORT_GPU contextOptions.fExecutor = nullptr; +#endif Error refErr = this->onDraw(src, &reference, &refStream, &refLog, contextOptions); if (!refErr.isEmpty()) { return refErr; -- cgit v1.2.3