diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-10 17:24:17 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-10 17:25:26 +0000 |
| commit | 636d8033229e1a70944e77470b9ed593bedf78e5 (patch) | |
| tree | 2c5f6108206242c93be5cc457b22f0022f465821 | |
| parent | 0b1e628835309e09412ebe4b60b0d2b66a8290e1 (diff) | |
Revert "Driver bug workaround: disable_blend_equation_advanced"
This reverts commit f31fece6581a46b40403fc78c83c7eebe50816ba.
Reason for revert: need to revert to revert original change breaking chrome compile
Original change's description:
> Driver bug workaround: disable_blend_equation_advanced
>
> Bug: chromium: 829614
> Change-Id: If8eaec6d22412ec36aad8a143f84080be05f2926
> Reviewed-on: https://skia-review.googlesource.com/126748
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Adrienne Walker <enne@chromium.org>
TBR=bsalomon@google.com,enne@chromium.org
Change-Id: Ic870fbbad615d13569254c355ef6b8281332d60d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium: 829614
Reviewed-on: https://skia-review.googlesource.com/127301
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
| -rw-r--r-- | include/gpu/GrCaps.h | 4 | ||||
| -rw-r--r-- | include/gpu/GrDriverBugWorkaroundsAutogen.h | 10 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/gpu_workaround_list.txt | 1 |
4 files changed, 6 insertions, 14 deletions
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 82c8f41fd6..7d77bdac92 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -328,8 +328,6 @@ protected: int fMaxWindowRectangles; int fMaxClipAnalyticFPs; - GrDriverBugWorkarounds fDriverBugWorkarounds; - private: virtual void onApplyOptionsOverrides(const GrContextOptions&) {} virtual void onDumpJSON(SkJSONWriter*) const {} @@ -343,6 +341,8 @@ private: bool fSuppressPrints : 1; bool fWireframeMode : 1; + GrDriverBugWorkarounds fDriverBugWorkarounds; + typedef SkRefCnt INHERITED; }; diff --git a/include/gpu/GrDriverBugWorkaroundsAutogen.h b/include/gpu/GrDriverBugWorkaroundsAutogen.h index a41237f675..87aa46172e 100644 --- a/include/gpu/GrDriverBugWorkaroundsAutogen.h +++ b/include/gpu/GrDriverBugWorkaroundsAutogen.h @@ -6,10 +6,8 @@ // 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) \ - GPU_OP(DISABLE_BLEND_EQUATION_ADVANCED, \ - disable_blend_equation_advanced) \ + 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/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 43f285e941..4b77fc0421 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2624,11 +2624,6 @@ void GrGLCaps::applyDriverCorrectnessWorkarounds(const GrGLContextInfo& ctxInfo, shaderCaps->fAdvBlendEqInteraction = GrShaderCaps::kNotSupported_AdvBlendEqInteraction; } - if (fDriverBugWorkarounds.disable_blend_equation_advanced) { - fBlendEquationSupport = kBasic_BlendEquationSupport; - shaderCaps->fAdvBlendEqInteraction = GrShaderCaps::kNotSupported_AdvBlendEqInteraction; - } - if (this->advancedBlendEquationSupport()) { if (kNVIDIA_GrGLDriver == ctxInfo.driver() && ctxInfo.driverVersion() < GR_GL_DRIVER_VER(355, 00, 0)) { diff --git a/src/gpu/gpu_workaround_list.txt b/src/gpu/gpu_workaround_list.txt index 17b5beb104..89a7231e9c 100644 --- a/src/gpu/gpu_workaround_list.txt +++ b/src/gpu/gpu_workaround_list.txt @@ -1,3 +1,2 @@ avoid_stencil_buffers -disable_blend_equation_advanced clear_to_zero_or_one_broken |