commit 8630320433bd15aca239522e54e711ef6372ab07
author Mathias Agopian <mathias@google.com> Tue Jul 24 22:46:10 2012 -0700
committer Mathias Agopian <mathias@google.com> Tue Jul 24 22:49:49 2012 -0700
tree 84962f25d1d4a082be23b13e3b71e845b0572e92
parent 98a121aa916eb7acbf11df0e3e31a6fede6fc9dd

split HWComposer out of DisplayHardware

we will only ever have a single instance of HWComposer, so
it's now an attribute of SurfaceFlinger, instead of being part
of DisplayHardware.

DisplayHardware now just represents a "display" (it should be renamed).

Change-Id: Iec191e57686868e1df6daa8b880a286c9fefde56

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 6d0631d..1742f1b 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -276,9 +276,14 @@
 }
 
 status_t HWComposer::commit() const {
-    int err = mHwc->set(mHwc, mDpy, mSur, mList);
-    if (mList) {
-        mList->flags &= ~HWC_GEOMETRY_CHANGED;
+    int err = NO_ERROR;
+    if (mHwc) {
+        err = mHwc->set(mHwc, mDpy, mSur, mList);
+        if (mList) {
+            mList->flags &= ~HWC_GEOMETRY_CHANGED;
+        }
+    } else {
+        eglSwapBuffers(mDpy, mSur);
     }
     return (status_t)err;
 }