diff options
author | Greg Daniel <egdaniel@google.com> | 2018-05-10 17:25:52 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-10 17:30:00 +0000 |
commit | 024615e9752d93c842ad3cad597fd65382ddb678 (patch) | |
tree | 0a8f4fdc93c5b18ec3860770add7d33bdb66d9b4 /include | |
parent | 636d8033229e1a70944e77470b9ed593bedf78e5 (diff) |
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 <bsalomon@google.com>
> Commit-Queue: Adrienne Walker <enne@chromium.org>
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 <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/GrCaps.h | 3 | ||||
-rw-r--r-- | include/gpu/GrContextOptions.h | 9 | ||||
-rw-r--r-- | include/gpu/GrDriverBugWorkarounds.h | 51 | ||||
-rw-r--r-- | include/gpu/GrDriverBugWorkaroundsAutogen.h | 13 |
4 files changed, 0 insertions, 76 deletions
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/include/gpu/GrDriverBugWorkarounds.h b/include/gpu/GrDriverBugWorkarounds.h deleted file mode 100644 index 31f6df5a33..0000000000 --- a/include/gpu/GrDriverBugWorkarounds.h +++ /dev/null @@ -1,51 +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 "SkTypes.h" - -#include <stdint.h> -#include <vector> - -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<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; - GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP) -#undef GPU_OP -}; - -#endif diff --git a/include/gpu/GrDriverBugWorkaroundsAutogen.h b/include/gpu/GrDriverBugWorkaroundsAutogen.h deleted file mode 100644 index 87aa46172e..0000000000 --- a/include/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 |