Expand the displayFrame for shadows
Bug: 185799825
Test: manual
Test: libcompositionengine_test
Some HWCs crop to the displayFrame. A shadow layer uses its
geometry.boundaries (possibly cropped by geometry.cropRect) as the
size of the object casting a shadow, so the shadow may not be contained
by the displayFrame. For a shadow, expand the displayFrame out by the
shadowRadius to prevent cropping of the shadow.
Change-Id: I8b6c7953d05718a89bdbc59d57775e52195a8131
diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
index e4e46a7..56e9d27 100644
--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
@@ -216,8 +216,18 @@
// reduce uses a FloatRect to provide more accuracy during the
// transformation. We then round upon constructing 'frame'.
- Rect frame{
- layerTransform.transform(reduce(layerState.geomLayerBounds, activeTransparentRegion))};
+ FloatRect geomLayerBounds = layerState.geomLayerBounds;
+
+ // Some HWCs may clip client composited input to its displayFrame. Make sure
+ // that this does not cut off the shadow.
+ if (layerState.forceClientComposition && layerState.shadowRadius > 0.0f) {
+ const auto outset = layerState.shadowRadius;
+ geomLayerBounds.left -= outset;
+ geomLayerBounds.top -= outset;
+ geomLayerBounds.right += outset;
+ geomLayerBounds.bottom += outset;
+ }
+ Rect frame{layerTransform.transform(reduce(geomLayerBounds, activeTransparentRegion))};
if (!frame.intersect(outputState.layerStackSpace.content, &frame)) {
frame.clear();
}