Switch SurfaceFlinger to HWC 2.0
Enables SurfaceFlinger to speak to version 2.0 of the Hardware Composer
HAL instead of version 1.x (also removing support for the framebuffer
HAL). By default, however, this functionality is disabled. In order to
enable it, USE_HWC2 must be set to true in Android.mk.
Change-Id: I4589e02ac2165236b10ff2f7cb772f87e0d3daab
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 4101a70..7d6f139 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -119,7 +119,11 @@
// enable/disable h/w composer event
// TODO: this should be made accessible only to EventThread
+#ifdef USE_HWC2
+ void setVsyncEnabled(int disp, int enabled);
+#else
void eventControl(int disp, int event, int enabled);
+#endif
// called on the main thread by MessageQueue when an internal message
// is received
@@ -361,8 +365,9 @@
// region of all screens presenting this layer stack.
void invalidateLayerStack(uint32_t layerStack, const Region& dirty);
- // allocate a h/w composer display id
+#ifndef USE_HWC2
int32_t allocateHwcDisplayId(DisplayDevice::DisplayType type);
+#endif
/* ------------------------------------------------------------------------
* H/W composer
@@ -458,8 +463,15 @@
// don't need synchronization
State mDrawingState;
bool mVisibleRegionsDirty;
+#ifndef USE_HWC2
bool mHwWorkListDirty;
+#else
+ bool mGeometryInvalid;
+#endif
bool mAnimCompositionPending;
+#ifdef USE_HWC2
+ std::vector<sp<Layer>> mLayersWithQueuedFrames;
+#endif
// this may only be written from the main thread with mStateLock held
// it may be read from other threads with mStateLock held