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 --- BUILD.gn | 2 +- dm/DMSrcSink.cpp | 6 +++- gn/gpu.gni | 2 +- include/gpu/GrContextOptions.h | 9 +++++ include/gpu/GrDriverBugWorkarounds.h | 51 +++++++++++++++++++++++++++++ include/gpu/GrDriverBugWorkaroundsAutogen.h | 13 ++++++++ src/gpu/GrCaps.cpp | 4 +++ src/gpu/GrCaps.h | 3 ++ src/gpu/GrDriverBugWorkarounds.cpp | 9 +++++ src/gpu/GrDriverBugWorkarounds.h | 44 ------------------------- src/gpu/GrDriverBugWorkaroundsAutogen.h | 13 -------- 11 files changed, 96 insertions(+), 60 deletions(-) create mode 100644 include/gpu/GrDriverBugWorkarounds.h create mode 100644 include/gpu/GrDriverBugWorkaroundsAutogen.h delete mode 100644 src/gpu/GrDriverBugWorkarounds.h delete mode 100644 src/gpu/GrDriverBugWorkaroundsAutogen.h diff --git a/BUILD.gn b/BUILD.gn index 66dac2c237..83146bbc58 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -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("src/gpu/GrDriverBugWorkaroundsAutogen.h", root_out_dir) + rebase_path("include/gpu/GrDriverBugWorkaroundsAutogen.h", root_out_dir) outputs = [ "$root_out_dir/$output_file", 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; diff --git a/gn/gpu.gni b/gn/gpu.gni index 136bade214..a495c550ea 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -14,6 +14,7 @@ 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", @@ -87,7 +88,6 @@ 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/GrContextOptions.h b/include/gpu/GrContextOptions.h index 3a0fba1adb..eea7771075 100644 --- a/include/gpu/GrContextOptions.h +++ b/include/gpu/GrContextOptions.h @@ -12,11 +12,13 @@ #include "SkTypes.h" #include "GrTypes.h" #include "../private/GrTypesPriv.h" +#include "GrDriverBugWorkarounds.h" #include class SkExecutor; +#if SK_SUPPORT_GPU struct GrContextOptions { enum class Enable { /** Forces an option to be disabled. */ @@ -239,6 +241,13 @@ struct GrContextOptions { */ Enable fDistanceFieldGlyphVerticesAlwaysHaveW = Enable::kDefault; #endif + + GrDriverBugWorkarounds fDriverBugWorkarounds; +}; +#else +struct GrContextOptions { + struct PersistentCache {}; }; +#endif #endif diff --git a/include/gpu/GrDriverBugWorkarounds.h b/include/gpu/GrDriverBugWorkarounds.h new file mode 100644 index 0000000000..31f6df5a33 --- /dev/null +++ b/include/gpu/GrDriverBugWorkarounds.h @@ -0,0 +1,51 @@ +/* + * Copyright 2018 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef GrDriverBugWorkarounds_DEFINED +#define GrDriverBugWorkarounds_DEFINED + +// External embedders of Skia can override this to use their own list +// of workaround names. +#ifdef SK_GPU_WORKAROUNDS_HEADER +#include SK_GPU_WORKAROUNDS_HEADER +#else +// To regenerate this file, set gn arg "skia_generate_workarounds = true". +// This is not rebuilt by default to avoid embedders having to have extra +// build steps. +#include "GrDriverBugWorkaroundsAutogen.h" +#endif + +#include "SkTypes.h" + +#include +#include + +enum GrDriverBugWorkaroundType { +#define GPU_OP(type, name) type, + GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP) +#undef GPU_OP + NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES +}; + +class SK_API GrDriverBugWorkarounds { + public: + GrDriverBugWorkarounds(); + explicit GrDriverBugWorkarounds(const std::vector& 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; + GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP) +#undef GPU_OP +}; + +#endif diff --git a/include/gpu/GrDriverBugWorkaroundsAutogen.h b/include/gpu/GrDriverBugWorkaroundsAutogen.h new file mode 100644 index 0000000000..87aa46172e --- /dev/null +++ b/include/gpu/GrDriverBugWorkaroundsAutogen.h @@ -0,0 +1,13 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This file is auto-generated from build_workaround_header.py +// DO NOT EDIT! + +#define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)\ + GPU_OP(AVOID_STENCIL_BUFFERS, \ + avoid_stencil_buffers) \ + GPU_OP(CLEAR_TO_ZERO_OR_ONE_BROKEN, \ + clear_to_zero_or_one_broken) \ +// The End diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 0507a3fdfb..42d3d4c51a 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -94,6 +94,8 @@ GrCaps::GrCaps(const GrContextOptions& options) { fAvoidStencilBuffers = false; fPreferVRAMUseOverFlushes = true; + + fDriverBugWorkarounds = options.fDriverBugWorkarounds; } void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { @@ -123,6 +125,8 @@ 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/GrCaps.h b/src/gpu/GrCaps.h index 5858afa3c1..e2433c9c20 100644 --- a/src/gpu/GrCaps.h +++ b/src/gpu/GrCaps.h @@ -10,6 +10,7 @@ #include "../private/GrTypesPriv.h" #include "GrBlend.h" +#include "GrDriverBugWorkarounds.h" #include "GrShaderCaps.h" #include "SkImageInfo.h" #include "SkRefCnt.h" @@ -343,6 +344,8 @@ private: bool fSuppressPrints : 1; bool fWireframeMode : 1; + GrDriverBugWorkarounds fDriverBugWorkarounds; + typedef SkRefCnt INHERITED; }; diff --git a/src/gpu/GrDriverBugWorkarounds.cpp b/src/gpu/GrDriverBugWorkarounds.cpp index 5ed9d8d2ef..a1f27a3205 100644 --- a/src/gpu/GrDriverBugWorkarounds.cpp +++ b/src/gpu/GrDriverBugWorkarounds.cpp @@ -29,4 +29,13 @@ 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/src/gpu/GrDriverBugWorkarounds.h b/src/gpu/GrDriverBugWorkarounds.h deleted file mode 100644 index bca5dc99f1..0000000000 --- a/src/gpu/GrDriverBugWorkarounds.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2018 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef GrDriverBugWorkarounds_DEFINED -#define GrDriverBugWorkarounds_DEFINED - -// External embedders of Skia can override this to use their own list -// of workaround names. -#ifdef SK_GPU_WORKAROUNDS_HEADER -#include SK_GPU_WORKAROUNDS_HEADER -#else -// To regenerate this file, set gn arg "skia_generate_workarounds = true". -// This is not rebuilt by default to avoid embedders having to have extra -// build steps. -#include "GrDriverBugWorkaroundsAutogen.h" -#endif - -#include -#include - -enum GrDriverBugWorkaroundType { -#define GPU_OP(type, name) type, - GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP) -#undef GPU_OP - NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES -}; - -class GrDriverBugWorkarounds { - public: - GrDriverBugWorkarounds(); - explicit GrDriverBugWorkarounds(const std::vector& workarounds); - - ~GrDriverBugWorkarounds(); - -#define GPU_OP(type, name) bool name = false; - GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP) -#undef GPU_OP -}; - -#endif diff --git a/src/gpu/GrDriverBugWorkaroundsAutogen.h b/src/gpu/GrDriverBugWorkaroundsAutogen.h deleted file mode 100644 index 87aa46172e..0000000000 --- a/src/gpu/GrDriverBugWorkaroundsAutogen.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2018 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is auto-generated from build_workaround_header.py -// DO NOT EDIT! - -#define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)\ - GPU_OP(AVOID_STENCIL_BUFFERS, \ - avoid_stencil_buffers) \ - GPU_OP(CLEAR_TO_ZERO_OR_ONE_BROKEN, \ - clear_to_zero_or_one_broken) \ -// The End -- cgit v1.2.3