Revert "SF: use shared_ptr to track hwcLayer"
This reverts commit 5d89c1d614426144b6430868a69db2b29b179213.
The original commit was part of a larger set that has been backed
out temporarily while some bugs are sorted out. This change
should have been backed out as well as it depends on the others
in the larger change.
Test: run cts -m CtsViewTestCases
Bug: 79264214
Change-Id: Ifa9388d9f9573073832a40075317fdabf74b180c
diff --git a/services/surfaceflinger/LayerBE.h b/services/surfaceflinger/LayerBE.h
index 981f756..76b9543 100644
--- a/services/surfaceflinger/LayerBE.h
+++ b/services/surfaceflinger/LayerBE.h
@@ -32,31 +32,6 @@
class LayerBE;
-class LayerContainer
-{
- public:
- LayerContainer(HWComposer* hwc, int32_t hwcId) : mHwc(hwc), mHwcId(hwcId) {
- mLayer = hwc->createLayer(hwcId);
- }
-
- ~LayerContainer() {
- mHwc->destroyLayer(mHwcId, mLayer);
- }
-
- HWC2::Layer* operator->() {
- return mLayer;
- }
-
- operator HWC2::Layer*const () const {
- return mLayer;
- }
-
- private:
- HWComposer* mHwc;
- int32_t mHwcId;
- HWC2::Layer* mLayer;
-};
-
struct CompositionInfo {
std::string layerName;
HWC2::Composition compositionType;
@@ -64,7 +39,7 @@
int mBufferSlot = BufferQueue::INVALID_BUFFER_SLOT;
LayerBE* layer = nullptr;
struct {
- std::shared_ptr<LayerContainer> hwcLayer;
+ HWC2::Layer* hwcLayer;
int32_t hwid = -1;
sp<Fence> fence;
HWC2::BlendMode blendMode = HWC2::BlendMode::Invalid;
@@ -125,7 +100,7 @@
transform(HWC2::Transform::None) {}
HWComposer* hwc;
- std::shared_ptr<LayerContainer> layer;
+ HWC2::Layer* layer;
bool forceClientComposition;
HWC2::Composition compositionType;
bool clearClientTarget;