aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-05-10 17:24:17 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-10 17:25:26 +0000
commit636d8033229e1a70944e77470b9ed593bedf78e5 (patch)
tree2c5f6108206242c93be5cc457b22f0022f465821 /src
parent0b1e628835309e09412ebe4b60b0d2b66a8290e1 (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>
Diffstat (limited to 'src')
-rw-r--r--src/gpu/gl/GrGLCaps.cpp5
-rw-r--r--src/gpu/gpu_workaround_list.txt1
2 files changed, 0 insertions, 6 deletions
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