summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--services/surfaceflinger/Android.bp1
-rw-r--r--services/surfaceflinger/BufferQueueLayer.cpp1
-rw-r--r--services/surfaceflinger/Layer.cpp5
-rw-r--r--services/surfaceflinger/Layer.h7
-rw-r--r--services/surfaceflinger/LayerBE.cpp40
-rw-r--r--services/surfaceflinger/LayerBE.h63
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp16
-rw-r--r--services/surfaceflinger/SurfaceFlinger.h5
8 files changed, 1 insertions, 137 deletions
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index 734ed6c6ca..a980885439 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -134,7 +134,6 @@ filegroup {
"EventLog/EventLog.cpp",
"FrameTracker.cpp",
"Layer.cpp",
- "LayerBE.cpp",
"LayerProtoHelper.cpp",
"LayerRejecter.cpp",
"LayerStats.cpp",
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index b3e2a4b012..a6052dd5b7 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -199,7 +199,6 @@ bool BufferQueueLayer::latchSidebandStream(bool& recomputeVisibleRegions) {
bool sidebandStreamChanged = true;
if (mSidebandStreamChanged.compare_exchange_strong(sidebandStreamChanged, false)) {
// mSidebandStreamChanged was changed to false
- // replicated in LayerBE until FE/BE is ready to be synchronized
auto& layerCompositionState = getCompositionLayer()->editState().frontEnd;
layerCompositionState.sidebandStream = mConsumer->getSidebandStream();
if (layerCompositionState.sidebandStream != nullptr) {
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index daef7c6236..5fb8e53ace 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -69,10 +69,7 @@ using base::StringAppendF;
std::atomic<int32_t> Layer::sSequence{1};
Layer::Layer(const LayerCreationArgs& args)
- : mFlinger(args.flinger),
- mName(args.name),
- mClientRef(args.client),
- mBE{this, args.name.string()} {
+ : mFlinger(args.flinger), mName(args.name), mClientRef(args.client) {
mCurrentCrop.makeInvalid();
uint32_t layerFlags = 0;
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 384f9e0947..984bd35561 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -45,7 +45,6 @@
#include "Client.h"
#include "FrameTracker.h"
-#include "LayerBE.h"
#include "LayerVector.h"
#include "MonitoredProducer.h"
#include "SurfaceFlinger.h"
@@ -67,7 +66,6 @@ class DisplayDevice;
class GraphicBuffer;
class SurfaceFlinger;
class LayerDebugInfo;
-class LayerBE;
namespace compositionengine {
class Layer;
@@ -97,9 +95,6 @@ class Layer : public virtual compositionengine::LayerFE {
static std::atomic<int32_t> sSequence;
public:
- friend class LayerBE;
- LayerBE& getBE() { return mBE; }
- LayerBE& getBE() const { return mBE; }
mutable bool contentDirty{false};
// regions below are in window-manager space
Region visibleRegion;
@@ -860,8 +855,6 @@ protected:
wp<Layer> mCurrentParent;
wp<Layer> mDrawingParent;
- mutable LayerBE mBE;
-
// Can only be accessed with the SF state lock held.
bool mLayerDetached{false};
// Can only be accessed with the SF state lock held.
diff --git a/services/surfaceflinger/LayerBE.cpp b/services/surfaceflinger/LayerBE.cpp
deleted file mode 100644
index 9f634408c7..0000000000
--- a/services/surfaceflinger/LayerBE.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_NDEBUG 0
-#undef LOG_TAG
-#define LOG_TAG "LayerBE"
-#define ATRACE_TAG ATRACE_TAG_GRAPHICS
-
-#include "Layer.h"
-
-namespace android {
-
-LayerBE::LayerBE(Layer* layer, std::string layerName) : mLayer(layer) {
- compositionInfo.layer = std::make_shared<LayerBE>(*this);
- compositionInfo.layerName = layerName;
-}
-
-LayerBE::LayerBE(const LayerBE& layer) : mLayer(layer.mLayer) {
- compositionInfo.layer = layer.compositionInfo.layer;
- compositionInfo.layerName = layer.mLayer->getName().string();
-}
-
-void LayerBE::onLayerDisplayed(const sp<Fence>& releaseFence) {
- mLayer->onLayerDisplayed(releaseFence);
-}
-
-}; // namespace android
diff --git a/services/surfaceflinger/LayerBE.h b/services/surfaceflinger/LayerBE.h
deleted file mode 100644
index 51f7857356..0000000000
--- a/services/surfaceflinger/LayerBE.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <string.h>
-
-#include <ui/Fence.h>
-#include <utils/StrongPointer.h>
-
-#include "DisplayHardware/DisplayIdentification.h"
-
-namespace android {
-
-class LayerBE;
-
-struct CompositionInfo {
- std::string layerName;
- std::shared_ptr<LayerBE> layer;
- struct {
- DisplayId displayId;
- } hwc;
-};
-
-class LayerBE {
-public:
- friend class Layer;
- friend class BufferLayer;
- friend class BufferQueueLayer;
- friend class BufferStateLayer;
- friend class ColorLayer;
- friend class SurfaceFlinger;
-
- // For unit tests
- friend class TestableSurfaceFlinger;
-
- LayerBE(Layer* layer, std::string layerName);
- explicit LayerBE(const LayerBE& layer);
-
- void onLayerDisplayed(const sp<Fence>& releaseFence);
-
- Layer*const mLayer;
-
-private:
- CompositionInfo compositionInfo;
-};
-
-}; // namespace android
-
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");
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index b1f0992378..587e0ddec9 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -53,7 +53,6 @@
#include "DisplayHardware/HWComposer.h"
#include "Effects/Daltonizer.h"
#include "FrameTracker.h"
-#include "LayerBE.h"
#include "LayerStats.h"
#include "LayerVector.h"
#include "Scheduler/DispSync.h"
@@ -103,7 +102,6 @@ class Surface;
class SurfaceFlingerBE;
class TimeStats;
class VSyncSource;
-struct CompositionInfo;
namespace compositionengine {
class DisplaySurface;
@@ -196,9 +194,6 @@ public:
// use to differentiate callbacks from different hardware composer
// instances. Each hardware composer instance gets a different sequence id.
int32_t mComposerSequenceId;
-
- std::map<wp<IBinder>, std::vector<CompositionInfo>> mCompositionInfo;
- std::map<wp<IBinder>, std::vector<CompositionInfo>> mEndOfFrameCompositionInfo;
};
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-02 07:21:10 +0000