summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Lloyd Pique <lpique@google.com> 2019-01-29 18:42:24 -0800
committer Lloyd Pique <lpique@google.com> 2019-02-19 17:55:19 -0800
commitfa8fd6b18bf5bb00ee88bf27688ba8911f46cf51 (patch)
tree4a821fa285629791a1342d5caf9ef2dd43e5170d /services/surfaceflinger/SurfaceFlinger.cpp
parentcb54b3b7006d438c686efe70ceb6e9852898b294 (diff)
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
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp16
1 files changed, 0 insertions, 16 deletions
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<Hwc2::IComposerClient::Composition>(
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");