commit 34a09ba1efd706323a15633da5044b352988eb5f
author Jesse Hall <jessehall@google.com> Sun Jul 29 22:35:34 2012 -0700
committer Jesse Hall <jessehall@google.com> Mon Jul 30 16:10:49 2012 -0700
tree bd432b2c1944df390912a9a8bab959450762ba3b
parent 747c480b0e3cf9401ff53421be6a82b23fdc04c2

Move eglSwapBuffers out of HWComposer

Commit 8630320 moved the eglSwapBuffers fallback (for devices with no
HWC implementation) from DisplayHardware to HWComposer. But HWComposer
only knows about the framebuffer EGL display and surface handles if
there is a HWC, so it was always passing bogus handles.

This change moves the eglSwapBuffers fallback up to SurfaceFlinger,
which has access to the framebuffer EGL handles.

Bug: 6886613
Change-Id: Iad3f5ff7c90ee48d7053999e6a4548d6794b6ebd

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 192378f..6cf1128 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -363,8 +363,8 @@
             "Initializing graphics H/W...");
 
     // initialize EGL
-    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    eglInitialize(display, NULL, NULL);
+    mEGLDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    eglInitialize(mEGLDisplay, NULL, NULL);
 
     // Initialize the main display
     // create native window to main display
@@ -378,8 +378,8 @@
     // initialize the config and context
     int format;
     window->query(window, NATIVE_WINDOW_FORMAT, &format);
-    mEGLConfig  = selectEGLConfig(display, format);
-    mEGLContext = createGLContext(display, mEGLConfig);
+    mEGLConfig  = selectEGLConfig(mEGLDisplay, format);
+    mEGLContext = createGLContext(mEGLDisplay, mEGLConfig);
 
     // initialize our main display hardware
     DisplayHardware* const hw = new DisplayHardware(this, 0, anw, mEGLConfig);
@@ -387,7 +387,7 @@
 
     //  initialize OpenGL ES
     EGLSurface surface = hw->getEGLSurface();
-    initializeGL(display, surface);
+    initializeGL(mEGLDisplay, surface);
 
     // start the EventThread
     mEventThread = new EventThread(this);
@@ -397,9 +397,6 @@
     mHwc = new HWComposer(this,
             *static_cast<HWComposer::EventHandler *>(this),
             hw->getRefreshPeriod());
-    if (mHwc->initCheck() == NO_ERROR) {
-        mHwc->setFrameBuffer(display, surface);
-    }
 
     // We're now ready to accept clients...
     mReadyToRunBarrier.open();
@@ -733,15 +730,16 @@
     }
 
     hw.flip(mSwapRegion);
-    hwc.commit();
 
     if (hwc.initCheck() == NO_ERROR) {
+        hwc.commit(mEGLDisplay, hw.getEGLSurface());
         HWComposer::LayerListIterator cur = hwc.begin();
         const HWComposer::LayerListIterator end = hwc.end();
         for (size_t i = 0; cur != end && i < numLayers; ++i, ++cur) {
             layers[i]->onLayerDisplayed(&*cur);
         }
     } else {
+        eglSwapBuffers(mEGLDisplay, hw.getEGLSurface());
         for (size_t i = 0; i < numLayers; i++) {
             layers[i]->onLayerDisplayed(NULL);
         }