From 0b1e628835309e09412ebe4b60b0d2b66a8290e1 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Thu, 10 May 2018 17:24:47 +0000 Subject: [PATCH] Revert "Driver bug workaround: disable_discard_framebuffer" This reverts commit 8aa0dca395d49b136ab59f6e96c4446342c9ebd2. Reason for revert: need to revert to revert original change breaking chrome compile Original change's description: > Driver bug workaround: disable_discard_framebuffer > > Bug: chromium: 829614 > Change-Id: I285b39b31a370247518e3a0b56ac4ea54f38c0c0 > Reviewed-on: https://skia-review.googlesource.com/126749 > Commit-Queue: Adrienne Walker > Commit-Queue: Brian Salomon > Auto-Submit: Adrienne Walker > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,enne@chromium.org Change-Id: I563808025a8f77807478c0f0d42c3009c3b57ea5 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium: 829614 Reviewed-on: https://skia-review.googlesource.com/127302 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- include/gpu/GrDriverBugWorkaroundsAutogen.h | 6 ++++-- src/gpu/gl/GrGLCaps.cpp | 3 +-- src/gpu/gpu_workaround_list.txt | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/gpu/GrDriverBugWorkaroundsAutogen.h b/include/gpu/GrDriverBugWorkaroundsAutogen.h index feda01bfcf..a41237f675 100644 --- a/include/gpu/GrDriverBugWorkaroundsAutogen.h +++ b/include/gpu/GrDriverBugWorkaroundsAutogen.h @@ -6,8 +6,10 @@ // 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(DISABLE_DISCARD_FRAMEBUFFER, \ - disable_discard_framebuffer) \ // The End diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 2acc7ca91f..43f285e941 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2333,8 +2333,7 @@ void GrGLCaps::applyDriverCorrectnessWorkarounds(const GrGLContextInfo& ctxInfo, GrShaderCaps* shaderCaps) { // A driver but on the nexus 6 causes incorrect dst copies when invalidate is called beforehand. // Thus we are blacklisting this extension for now on Adreno4xx devices. - if (kAdreno4xx_GrGLRenderer == ctxInfo.renderer() || - fDriverBugWorkarounds.disable_discard_framebuffer) { + if (kAdreno4xx_GrGLRenderer == ctxInfo.renderer()) { fDiscardRenderTargetSupport = false; fInvalidateFBType = kNone_InvalidateFBType; } diff --git a/src/gpu/gpu_workaround_list.txt b/src/gpu/gpu_workaround_list.txt index dbded3f11c..17b5beb104 100644 --- a/src/gpu/gpu_workaround_list.txt +++ b/src/gpu/gpu_workaround_list.txt @@ -1,2 +1,3 @@ +avoid_stencil_buffers disable_blend_equation_advanced -disable_discard_framebuffer +clear_to_zero_or_one_broken