From 024615e9752d93c842ad3cad597fd65382ddb678 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 10 May 2018 17:25:52 +0000 Subject: Revert "Add driver bug workarounds to GrCaps" This reverts commit 328490c6a1625ce51d0e81688e0c85c79c400d86. Reason for revert: Breaking compiles inside chrome 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 TBR=bsalomon@google.com,enne@chromium.org Change-Id: I3b35bf65a7b78d2fe16d7c2bcd0e4b3f9bb7fdff No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium: 829614 Reviewed-on: https://skia-review.googlesource.com/127303 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- dm/DMSrcSink.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dm') diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index efb0b3b4d4..5c8ab96806 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -1608,11 +1608,9 @@ 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 + contextOptions.fExecutor = fExecutor.get(); Error err = this->onDraw(src, dst, wStream, log, contextOptions); if (!err.isEmpty() || !dst) { return err; @@ -1621,9 +1619,7 @@ 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