commit 7c196d4a854de9f1f2dbd548fc26d80890a662c9
author Derek Sollenberger <djsollen@google.com> Tue Feb 21 17:37:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 17:37:38 2017 +0000
tree d0abce26db36f43735775d951a6b8b546f54524a
parent f8a420097e54a369d3bd1aa152ea0eea58ff5c94
parent b77c94a96abeeecf65c5b3292db679c049af6271

Merge "Disable buffer age swap behavior for SkiaGL on Adreno gpus"

libs/hwui/renderthread/EglManager.cpp

diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp
index 7020be0..860725b 100644
--- a/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@ -106,7 +106,10 @@
 
     // Now that extensions are loaded, pick a swap behavior
     if (Properties::enablePartialUpdates) {
-        if (Properties::useBufferAge && EglExtensions.bufferAge) {
+        // An Adreno driver bug is causing rendering problems for SkiaGL with
+        // buffer age swap behavior (b/31957043).  To temporarily workaround,
+        // we will use preserved swap behavior.
+        if (Properties::useBufferAge && EglExtensions.bufferAge && !Properties::isSkiaEnabled()) {
             mSwapBehavior = SwapBehavior::BufferAge;
         } else {
             mSwapBehavior = SwapBehavior::Preserved;