ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for plane-alpha in HWC 

Change-Id: I218e7dd5f23de535aabce61e993002ab6cb46cdd
This commit is contained in:
Mathias Agopian 2013-01-29 18:56:42 -08:00
parent 6cf6ba69f0
commit 9f8386e111
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -782,9 +782,10 @@ private:
* This implements the HWCLayer side of HWCIterableLayer. * This implements the HWCLayer side of HWCIterableLayer.
*/ */
class HWCLayerVersion1 : public Iterable<HWCLayerVersion1, hwc_layer_1_t> { class HWCLayerVersion1 : public Iterable<HWCLayerVersion1, hwc_layer_1_t> {
struct hwc_composer_device_1* mHwc;
public: public:
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) { } : Iterable<HWCLayerVersion1, hwc_layer_1_t>(layer), mHwc(hwc) { }
virtual int32_t getCompositionType() const { virtual int32_t getCompositionType() const {
return getLayer()->compositionType; return getLayer()->compositionType;
@ -800,17 +801,29 @@ public:
virtual void setAcquireFenceFd(int fenceFd) { virtual void setAcquireFenceFd(int fenceFd) {
getLayer()->acquireFenceFd = 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() { virtual void setDefaultState() {
getLayer()->compositionType = HWC_FRAMEBUFFER; hwc_layer_1_t* const l = getLayer();
getLayer()->hints = 0; l->compositionType = HWC_FRAMEBUFFER;
getLayer()->flags = HWC_SKIP_LAYER; l->hints = 0;
getLayer()->handle = 0; l->flags = HWC_SKIP_LAYER;
getLayer()->transform = 0; l->handle = 0;
getLayer()->blending = HWC_BLENDING_NONE; l->transform = 0;
getLayer()->visibleRegionScreen.numRects = 0; l->blending = HWC_BLENDING_NONE;
getLayer()->visibleRegionScreen.rects = NULL; l->visibleRegionScreen.numRects = 0;
getLayer()->acquireFenceFd = -1; l->visibleRegionScreen.rects = NULL;
getLayer()->releaseFenceFd = -1; l->acquireFenceFd = -1;
l->releaseFenceFd = -1;
l->planeAlpha = 0xFF;
} }
virtual void setSkip(bool skip) { virtual void setSkip(bool skip) {
if (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) { if (!mHwc || !disp.list || index > disp.list->numHwLayers) {
return LayerListIterator(); return LayerListIterator();
} }
return LayerListIterator(new HWCLayerVersion1(disp.list->hwLayers), index); return LayerListIterator(new HWCLayerVersion1(mHwc, disp.list->hwLayers), index);
} }
/* /*

1
services/surfaceflinger/DisplayHardware/HWComposer.h
View File

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

9
services/surfaceflinger/Layer.cpp
View File

@ -251,16 +251,13 @@ void Layer::setGeometry(
// enable this layer // enable this layer
layer.setSkip(false); 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()) { if (isSecure() && !hw->isSecure()) {
layer.setSkip(true); layer.setSkip(true);
} }
const State& s(drawingState());
layer.setPlaneAlpha(s.alpha);
/* /*
* Transformations are applied in this order: * Transformations are applied in this order:
* 1) buffer orientation/flip/mirror * 1) buffer orientation/flip/mirror

2
services/surfaceflinger/LayerBase.cpp
View File

@ -283,7 +283,7 @@ void LayerBase::setGeometry(
layer.setTransform(finalTransform); layer.setTransform(finalTransform);
} }
if (!isOpaque()) { if (!isOpaque() || s.alpha != 0xFF) {
layer.setBlending(mPremultipliedAlpha ? layer.setBlending(mPremultipliedAlpha ?
HWC_BLENDING_PREMULT : HWC_BLENDING_PREMULT :
HWC_BLENDING_COVERAGE); HWC_BLENDING_COVERAGE);