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/Layer.h b/services/surfaceflinger/Layer.h
index 1773daf..26e1adb 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -107,7 +107,11 @@
Geometry requested;
uint32_t z;
uint32_t layerStack;
+#ifdef USE_HWC2
+ float alpha;
+#else
uint8_t alpha;
+#endif
uint8_t flags;
uint8_t mask;
uint8_t reserved[2];
@@ -141,7 +145,11 @@
bool setPosition(float x, float y);
bool setLayer(uint32_t z);
bool setSize(uint32_t w, uint32_t h);
+#ifdef USE_HWC2
+ bool setAlpha(float alpha);
+#else
bool setAlpha(uint8_t alpha);
+#endif
bool setMatrix(const layer_state_t::matrix22_t& matrix);
bool setTransparentRegionHint(const Region& transparent);
bool setFlags(uint8_t flags, uint8_t mask);
@@ -214,6 +222,22 @@
public:
// -----------------------------------------------------------------------
+#ifdef USE_HWC2
+ void setGeometry(const sp<const DisplayDevice>& displayDevice);
+ void forceClientComposition(int32_t hwcId);
+ void setPerFrameData(const sp<const DisplayDevice>& displayDevice);
+
+ // callIntoHwc exists so we can update our local state and call
+ // acceptDisplayChanges without unnecessarily updating the device's state
+ void setCompositionType(int32_t hwcId, HWC2::Composition type,
+ bool callIntoHwc = true);
+ HWC2::Composition getCompositionType(int32_t hwcId) const;
+
+ void setClearClientTarget(int32_t hwcId, bool clear);
+ bool getClearClientTarget(int32_t hwcId) const;
+
+ void updateCursorPosition(const sp<const DisplayDevice>& hw);
+#else
void setGeometry(const sp<const DisplayDevice>& hw,
HWComposer::HWCLayerInterface& layer);
void setPerFrameData(const sp<const DisplayDevice>& hw,
@@ -222,12 +246,17 @@
HWComposer::HWCLayerInterface& layer);
Rect getPosition(const sp<const DisplayDevice>& hw);
+#endif
/*
* called after page-flip
*/
+#ifdef USE_HWC2
+ void onLayerDisplayed(const sp<Fence>& releaseFence);
+#else
void onLayerDisplayed(const sp<const DisplayDevice>& hw,
HWComposer::HWCLayerInterface* layer);
+#endif
bool shouldPresentNow(const DispSync& dispSync) const;
@@ -242,6 +271,11 @@
*/
void onPostComposition();
+#ifdef USE_HWC2
+ // If a buffer was replaced this frame, release the former buffer
+ void releasePendingBuffer();
+#endif
+
/*
* draw - performs some global clipping optimizations
* and calls onDraw().
@@ -309,6 +343,37 @@
bool hasQueuedFrame() const { return mQueuedFrames > 0 ||
mSidebandStreamChanged || mAutoRefresh; }
+#ifdef USE_HWC2
+ // -----------------------------------------------------------------------
+
+ bool hasHwcLayer(int32_t hwcId) {
+ if (mHwcLayers.count(hwcId) == 0) {
+ return false;
+ }
+ if (mHwcLayers[hwcId].layer->isAbandoned()) {
+ ALOGI("Erasing abandoned layer %s on %d", mName.string(), hwcId);
+ mHwcLayers.erase(hwcId);
+ return false;
+ }
+ return true;
+ }
+
+ std::shared_ptr<HWC2::Layer> getHwcLayer(int32_t hwcId) {
+ if (mHwcLayers.count(hwcId) == 0) {
+ return nullptr;
+ }
+ return mHwcLayers[hwcId].layer;
+ }
+
+ void setHwcLayer(int32_t hwcId, std::shared_ptr<HWC2::Layer>&& layer) {
+ if (layer) {
+ mHwcLayers[hwcId].layer = layer;
+ } else {
+ mHwcLayers.erase(hwcId);
+ }
+ }
+
+#endif
// -----------------------------------------------------------------------
void clearWithOpenGL(const sp<const DisplayDevice>& hw, const Region& clip) const;
@@ -474,6 +539,23 @@
// The texture used to draw the layer in GLES composition mode
mutable Texture mTexture;
+#ifdef USE_HWC2
+ // HWC items, accessed from the main thread
+ struct HWCInfo {
+ HWCInfo()
+ : layer(),
+ forceClientComposition(false),
+ compositionType(HWC2::Composition::Invalid),
+ clearClientTarget(false) {}
+
+ std::shared_ptr<HWC2::Layer> layer;
+ bool forceClientComposition;
+ HWC2::Composition compositionType;
+ bool clearClientTarget;
+ };
+ std::unordered_map<int32_t, HWCInfo> mHwcLayers;
+#endif
+
// page-flip thread (currently main thread)
bool mProtectedByApp; // application requires protected path to external sink