Add support for plane-alpha in HWC (9f8386e1) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+26 −13

Original line number	Diff line number	Diff line
		@@ -782,9 +782,10 @@ private:
		* This implements the HWCLayer side of HWCIterableLayer.
		*/
		class HWCLayerVersion1 : public Iterable<HWCLayerVersion1, hwc_layer_1_t> {
		struct hwc_composer_device_1* mHwc;
		public:
		HWCLayerVersion1(hwc_layer_1_t* layer)
		: Iterable<HWCLayerVersion1, hwc_layer_1_t>(layer) { }
		HWCLayerVersion1(struct hwc_composer_device_1* hwc, hwc_layer_1_t* layer)
		: Iterable<HWCLayerVersion1, hwc_layer_1_t>(layer), mHwc(hwc) { }

		virtual int32_t getCompositionType() const {
		return getLayer()->compositionType;
		@@ -800,17 +801,29 @@ public:
		virtual void setAcquireFenceFd(int fenceFd) {
		getLayer()->acquireFenceFd = fenceFd;
		}
		virtual void setPerFrameDefaultState() {
		//getLayer()->compositionType = HWC_FRAMEBUFFER;
		}
		virtual void setPlaneAlpha(uint8_t alpha) {
		if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_2)) {
		getLayer()->planeAlpha = alpha;
		} else {
		getLayer()->flags \|= HWC_SKIP_LAYER;
		}
		}
		virtual void setDefaultState() {
		getLayer()->compositionType = HWC_FRAMEBUFFER;
		getLayer()->hints = 0;
		getLayer()->flags = HWC_SKIP_LAYER;
		getLayer()->handle = 0;
		getLayer()->transform = 0;
		getLayer()->blending = HWC_BLENDING_NONE;
		getLayer()->visibleRegionScreen.numRects = 0;
		getLayer()->visibleRegionScreen.rects = NULL;
		getLayer()->acquireFenceFd = -1;
		getLayer()->releaseFenceFd = -1;
		hwc_layer_1_t* const l = getLayer();
		l->compositionType = HWC_FRAMEBUFFER;
		l->hints = 0;
		l->flags = HWC_SKIP_LAYER;
		l->handle = 0;
		l->transform = 0;
		l->blending = HWC_BLENDING_NONE;
		l->visibleRegionScreen.numRects = 0;
		l->visibleRegionScreen.rects = NULL;
		l->acquireFenceFd = -1;
		l->releaseFenceFd = -1;
		l->planeAlpha = 0xFF;
		}
		virtual void setSkip(bool skip) {
		if (skip) {
		@@ -873,7 +886,7 @@ HWComposer::LayerListIterator HWComposer::getLayerIterator(int32_t id, size_t in
		if (!mHwc \|\| !disp.list \|\| index > disp.list->numHwLayers) {
		return LayerListIterator();
		}
		return LayerListIterator(new HWCLayerVersion1(disp.list->hwLayers), index);
		return LayerListIterator(new HWCLayerVersion1(mHwc, disp.list->hwLayers), index);
		}

		/*

services/surfaceflinger/DisplayHardware/HWComposer.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ public:
		virtual void setVisibleRegionScreen(const Region& reg) = 0;
		virtual void setBuffer(const sp<GraphicBuffer>& buffer) = 0;
		virtual void setAcquireFenceFd(int fenceFd) = 0;
		virtual void setPlaneAlpha(uint8_t alpha) = 0;
		virtual void onDisplayed() = 0;
		};

services/surfaceflinger/Layer.cpp

+3 −6

Original line number	Diff line number	Diff line
		@@ -251,16 +251,13 @@ void Layer::setGeometry(
		// enable this layer
		layer.setSkip(false);

		// we can't do alpha-fade with the hwc HAL
		const State& s(drawingState());
		if (s.alpha < 0xFF) {
		layer.setSkip(true);
		}

		if (isSecure() && !hw->isSecure()) {
		layer.setSkip(true);
		}

		const State& s(drawingState());
		layer.setPlaneAlpha(s.alpha);

		/*
		* Transformations are applied in this order:
		* 1) buffer orientation/flip/mirror

services/surfaceflinger/LayerBase.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,7 @@ void LayerBase::setGeometry(
		layer.setTransform(finalTransform);
		}

		if (!isOpaque()) {
		if (!isOpaque() \|\| s.alpha != 0xFF) {
		layer.setBlending(mPremultipliedAlpha ?
		HWC_BLENDING_PREMULT :
		HWC_BLENDING_COVERAGE);