CE: Remove compositionengine::Layer
This was a mostly straightforward refactor that restructures the interface between SurfaceFlinger and CompositionEngine. 1) Instead of each SurfaceFlinger Layer creating and owning a compositionengine::Layer, each Layer instead creates and owns a compositionengine::LayerFECompositionState structure. Containing this state structure was the only real purpose for compositionengine::Layer. 2) Use the compositionengine::LayerFE interface in CompositionEngine in place of compositionengine::Layer. This includes passing a std::vector for the layers when SurfaceFlinger calls into CompositionEngine. 3) Alters the LayerFE interface to add the ability to get the state, as well as changing the existing "latchCompositionState" calls taking a state reference as the first argument into "prepareCompositionState" calls that do not need it, as the target of the call owns the state. 4) Alters the SurfaceFlinger Layer implementations to match the LayerFE interface changes. Test: atest libcompositionengine_test libsurfaceflinger_unittest Test: atest CtsColorModeTestCases Test: atest CtsDisplayTestCases Test: atest CtsGraphicsTestCases Test: atest CtsUiRenderingTestCases Test: atest CtsViewTestCases Test: atest android.media.cts.EncodeVirtualDisplayWithCompositionTest Test: go/wm-smoke Bug: 144117494 Change-Id: Id45df7c9cc389c8fd834ba379bc0d6360a984dac
Showing
- services/surfaceflinger/BufferLayer.cpp 21 additions, 16 deletionsservices/surfaceflinger/BufferLayer.cpp
- services/surfaceflinger/BufferLayer.h 5 additions, 3 deletionsservices/surfaceflinger/BufferLayer.h
- services/surfaceflinger/BufferQueueLayer.cpp 13 additions, 13 deletionsservices/surfaceflinger/BufferQueueLayer.cpp
- services/surfaceflinger/BufferQueueLayer.h 1 addition, 1 deletionservices/surfaceflinger/BufferQueueLayer.h
- services/surfaceflinger/BufferStateLayer.cpp 10 additions, 12 deletionsservices/surfaceflinger/BufferStateLayer.cpp
- services/surfaceflinger/BufferStateLayer.h 1 addition, 1 deletionservices/surfaceflinger/BufferStateLayer.h
- services/surfaceflinger/ColorLayer.cpp 16 additions, 11 deletionsservices/surfaceflinger/ColorLayer.cpp
- services/surfaceflinger/ColorLayer.h 5 additions, 3 deletionsservices/surfaceflinger/ColorLayer.h
- services/surfaceflinger/CompositionEngine/Android.bp 0 additions, 3 deletionsservices/surfaceflinger/CompositionEngine/Android.bp
- services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionEngine.h 3 additions, 2 deletions...itionEngine/include/compositionengine/CompositionEngine.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h 3 additions, 4 deletions...Engine/include/compositionengine/CompositionRefreshArgs.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/Layer.h 0 additions, 55 deletions...inger/CompositionEngine/include/compositionengine/Layer.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/LayerCreationArgs.h 0 additions, 35 deletions...itionEngine/include/compositionengine/LayerCreationArgs.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFE.h 9 additions, 7 deletions...ger/CompositionEngine/include/compositionengine/LayerFE.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFECompositionState.h 3 additions, 1 deletion...ngine/include/compositionengine/LayerFECompositionState.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h 4 additions, 6 deletions...nger/CompositionEngine/include/compositionengine/Output.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/OutputLayer.h 0 additions, 4 deletions...CompositionEngine/include/compositionengine/OutputLayer.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/impl/CompositionEngine.h 2 additions, 2 deletions...Engine/include/compositionengine/impl/CompositionEngine.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h 1 addition, 2 deletions...ompositionEngine/include/compositionengine/impl/Display.h
- services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Layer.h 0 additions, 84 deletions.../CompositionEngine/include/compositionengine/impl/Layer.h
Loading
Please register or sign in to comment