From fa8fd6b18bf5bb00ee88bf27688ba8911f46cf51 Mon Sep 17 00:00:00 2001 From: Lloyd Pique Date: Tue, 29 Jan 2019 18:42:24 -0800 Subject: SF: Remove LayerBE There was nothing important left. Everything is now done by the classes in CompositionEngine. Test: atest libsurfaceflinger_unittest libcompositionengine_test Bug: 121291683 Change-Id: I7c51f161ccb53ff3456fbef9df2a5bee0501de05 --- services/surfaceflinger/SurfaceFlinger.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'services/surfaceflinger/SurfaceFlinger.cpp') diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index e13a0368a9..4223236946 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1674,8 +1674,6 @@ void SurfaceFlinger::handleMessageRefresh() { mVsyncModulator.onRefreshed(mHadClientComposition); - getBE().mEndOfFrameCompositionInfo = std::move(getBE().mCompositionInfo); - mLayersWithQueuedFrames.clear(); } @@ -1788,12 +1786,9 @@ void SurfaceFlinger::calculateWorkingSet() { for (const auto& [token, displayDevice] : mDisplays) { auto display = displayDevice->getCompositionDisplay(); for (auto& layer : displayDevice->getVisibleLayersSortedByZ()) { - const auto displayId = display->getId(); auto& layerState = layer->getCompositionLayer()->editState().frontEnd; layerState.compositionType = static_cast( layer->getCompositionType(displayDevice)); - layer->getBE().compositionInfo.hwc.displayId = *displayId; - getBE().mCompositionInfo[token].push_back(layer->getBE().compositionInfo); } } } @@ -2164,17 +2159,6 @@ void SurfaceFlinger::rebuildLayerStacks() { ATRACE_CALL(); ALOGV("rebuildLayerStacks"); - // We need to clear these out now as these may be holding on to a - // HWC2::Layer reference at the same time as the LayerBE::HWCInfo structure - // also holds a reference. When the set of visible layers is recomputed, - // some layers may be destroyed if the only thing keeping them alive was - // that list of visible layers associated with each display. The layer - // destruction code asserts that the HWC2::Layer is properly destroyed, but - // that doesn't happen if SurfaceFlingerBE::mCompositionInfo keeps it alive. - for (const auto& [token, display] : mDisplays) { - getBE().mCompositionInfo[token].clear(); - } - // rebuild the visible layer list per screen if (CC_UNLIKELY(mVisibleRegionsDirty)) { ATRACE_NAME("rebuildLayerStacks VR Dirty"); -- cgit v1.2.3-59-g8ed1b