diff options
| author | 2017-05-25 00:59:58 +0000 | |
|---|---|---|
| committer | 2017-05-25 00:59:59 +0000 | |
| commit | 7bb8779a79f61edddab76d511b029fdffffcf1ca (patch) | |
| tree | 20858cadffa8e8e07c09627237e3e8110f5cdf0b | |
| parent | 77bee3b429457aa9298731880d39e0589b2db4d9 (diff) | |
| parent | 22ee2f4d2b7935a18a1d97bb8b8b058e7d41ad28 (diff) | |
Merge "SF: Call makeCurrent after presenting each display"
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index deeb45649d..617aec37c8 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1405,13 +1405,7 @@ void SurfaceFlinger::postFramebuffer() 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) { |