diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 6 | ||||
| -rw-r--r-- | gn/gpu.gni | 2 | ||||
| -rw-r--r-- | include/gpu/GrCaps.h | 3 | ||||
| -rw-r--r-- | include/gpu/GrContextOptions.h | 9 | ||||
| -rw-r--r-- | src/gpu/GrCaps.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/GrDriverBugWorkarounds.cpp | 9 | ||||
| -rw-r--r-- | src/gpu/GrDriverBugWorkarounds.h (renamed from include/gpu/GrDriverBugWorkarounds.h) | 9 | ||||
| -rw-r--r-- | src/gpu/GrDriverBugWorkaroundsAutogen.h (renamed from include/gpu/GrDriverBugWorkaroundsAutogen.h) | 0 |
9 files changed, 4 insertions, 40 deletions
@@ -839,7 +839,7 @@ if (skia_enable_gpu && skia_generate_workarounds) { # see comments in skia_compile_processors about out dir path shenanigans. output_file = - rebase_path("include/gpu/GrDriverBugWorkaroundsAutogen.h", root_out_dir) + rebase_path("src/gpu/GrDriverBugWorkaroundsAutogen.h", root_out_dir) outputs = [ "$root_out_dir/$output_file", 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; diff --git a/gn/gpu.gni b/gn/gpu.gni index 912900827d..8b79484fc5 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -15,7 +15,6 @@ skia_gpu_sources = [ "$_include/gpu/GrConfig.h", "$_include/gpu/GrContextOptions.h", "$_include/gpu/GrContext.h", - "$_include/gpu/GrDriverBugWorkarounds.h", "$_include/gpu/GrGpuResource.h", "$_include/gpu/GrRenderTarget.h", "$_include/gpu/GrResourceKey.h", @@ -88,6 +87,7 @@ skia_gpu_sources = [ "$_src/gpu/GrDrawOpTest.cpp", "$_src/gpu/GrDrawOpTest.h", "$_src/gpu/GrDriverBugWorkarounds.cpp", + "$_src/gpu/GrDriverBugWorkarounds.h", "$_src/gpu/GrFixedClip.cpp", "$_src/gpu/GrFixedClip.h", "$_src/gpu/GrFragmentProcessor.cpp", diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 7d77bdac92..0e81e236ef 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -10,7 +10,6 @@ #include "../private/GrTypesPriv.h" #include "GrBlend.h" -#include "GrDriverBugWorkarounds.h" #include "GrShaderCaps.h" #include "SkImageInfo.h" #include "SkRefCnt.h" @@ -341,8 +340,6 @@ private: bool fSuppressPrints : 1; bool fWireframeMode : 1; - GrDriverBugWorkarounds fDriverBugWorkarounds; - typedef SkRefCnt INHERITED; }; diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h index eea7771075..3a0fba1adb 100644 --- a/include/gpu/GrContextOptions.h +++ b/include/gpu/GrContextOptions.h @@ -12,13 +12,11 @@ #include "SkTypes.h" #include "GrTypes.h" #include "../private/GrTypesPriv.h" -#include "GrDriverBugWorkarounds.h" #include <vector> class SkExecutor; -#if SK_SUPPORT_GPU struct GrContextOptions { enum class Enable { /** Forces an option to be disabled. */ @@ -241,13 +239,6 @@ struct GrContextOptions { */ Enable fDistanceFieldGlyphVerticesAlwaysHaveW = Enable::kDefault; #endif - - GrDriverBugWorkarounds fDriverBugWorkarounds; -}; -#else -struct GrContextOptions { - struct PersistentCache {}; }; -#endif #endif diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 42d3d4c51a..0507a3fdfb 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -94,8 +94,6 @@ GrCaps::GrCaps(const GrContextOptions& options) { fAvoidStencilBuffers = false; fPreferVRAMUseOverFlushes = true; - - fDriverBugWorkarounds = options.fDriverBugWorkarounds; } void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { @@ -125,8 +123,6 @@ void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { fMaxWindowRectangles = GrWindowRectangles::kMaxWindows; } fAvoidStencilBuffers = options.fAvoidStencilBuffers; - - fDriverBugWorkarounds.applyOverrides(options.fDriverBugWorkarounds); } static SkString map_flags_to_string(uint32_t flags) { diff --git a/src/gpu/GrDriverBugWorkarounds.cpp b/src/gpu/GrDriverBugWorkarounds.cpp index a1f27a3205..5ed9d8d2ef 100644 --- a/src/gpu/GrDriverBugWorkarounds.cpp +++ b/src/gpu/GrDriverBugWorkarounds.cpp @@ -29,13 +29,4 @@ GrDriverBugWorkarounds::GrDriverBugWorkarounds( } } -void GrDriverBugWorkarounds::applyOverrides( - const GrDriverBugWorkarounds& workarounds) { -#define GPU_OP(type, name) \ - name |= workarounds.name; - - GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP) -#undef GPU_OP -} - GrDriverBugWorkarounds::~GrDriverBugWorkarounds() = default; diff --git a/include/gpu/GrDriverBugWorkarounds.h b/src/gpu/GrDriverBugWorkarounds.h index 31f6df5a33..bca5dc99f1 100644 --- a/include/gpu/GrDriverBugWorkarounds.h +++ b/src/gpu/GrDriverBugWorkarounds.h @@ -19,8 +19,6 @@ #include "GrDriverBugWorkaroundsAutogen.h" #endif -#include "SkTypes.h" - #include <stdint.h> #include <vector> @@ -31,16 +29,11 @@ enum GrDriverBugWorkaroundType { NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES }; -class SK_API GrDriverBugWorkarounds { +class GrDriverBugWorkarounds { public: GrDriverBugWorkarounds(); explicit GrDriverBugWorkarounds(const std::vector<int32_t>& workarounds); - GrDriverBugWorkarounds& operator=(const GrDriverBugWorkarounds&) = default; - - // Turn on any workarounds listed in |workarounds| (but don't turn any off). - void applyOverrides(const GrDriverBugWorkarounds& workarounds); - ~GrDriverBugWorkarounds(); #define GPU_OP(type, name) bool name = false; diff --git a/include/gpu/GrDriverBugWorkaroundsAutogen.h b/src/gpu/GrDriverBugWorkaroundsAutogen.h index 87aa46172e..87aa46172e 100644 --- a/include/gpu/GrDriverBugWorkaroundsAutogen.h +++ b/src/gpu/GrDriverBugWorkaroundsAutogen.h |