commit f846a35a68f14b0eca45e3cd7c6d3ca88a57fe52
author Chia-I Wu <olv@google.com> Fri Nov 10 09:22:52 2017 -0800
committer Chia-I Wu <olv@google.com> Wed Nov 29 14:03:13 2017 -0800
tree cc8552fe7fc5855c0df367454c4b27d0ef80b296
parent 7e60ecc269aa83758b96b97d709b91b00dee1e13

surfaceflinger: use RE::Surface in DisplayDevice

This allows us to eliminate all direct use of EGL from
DisplayDevice.

Test: SurfaceFlinger_test
Change-Id: Ic7b006dfd8e3f067625896c3020b55914b9fc65b

services/surfaceflinger/RenderEngine/RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index 2143c78..994d857 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -183,8 +183,17 @@
     return mEGLConfig;
 }
 
-bool RenderEngine::setCurrentSurface(EGLSurface surface) {
-    return eglMakeCurrent(mEGLDisplay, surface, surface, mEGLContext) == EGL_TRUE;
+bool RenderEngine::setCurrentSurface(const RE::Surface& surface) {
+    bool success = true;
+    EGLSurface eglSurface = surface.getEGLSurface();
+    if (eglSurface != eglGetCurrentSurface(EGL_DRAW)) {
+        success = eglMakeCurrent(mEGLDisplay, eglSurface, eglSurface, mEGLContext) == EGL_TRUE;
+        if (success && surface.getAsync()) {
+            eglSwapInterval(mEGLDisplay, 0);
+        }
+    }
+
+    return success;
 }
 
 void RenderEngine::resetCurrentSurface() {