commit 7bb8779a79f61edddab76d511b029fdffffcf1ca
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 25 00:59:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 25 00:59:59 2017 +0000
tree 20858cadffa8e8e07c09627237e3e8110f5cdf0b
parent 77bee3b429457aa9298731880d39e0589b2db4d9
parent 22ee2f4d2b7935a18a1d97bb8b8b058e7d41ad28

Merge "SF: Call makeCurrent after presenting each display"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index deeb456..617aec3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1405,13 +1405,7 @@
             mHwc->commit(hwcId);
         }
         displayDevice->onSwapBuffersCompleted();
-        if (displayId == 0) {
-            // Make the default display current because the VirtualDisplayDevice
-            // code cannot deal with dequeueBuffer() being called outside of the
-            // composition loop; however the code below can call glFlush() which
-            // is allowed to (and does in some case) call dequeueBuffer().
-            displayDevice->makeCurrent(mEGLDisplay, mEGLContext);
-        }
+        displayDevice->makeCurrent(mEGLDisplay, mEGLContext);
         for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) {
             sp<Fence> releaseFence = Fence::NO_FENCE;
             if (layer->getCompositionType(hwcId) == HWC2::Composition::Client) {