diff options
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 11 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.h | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 5 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/CompositionTest.cpp | 5 |
4 files changed, 0 insertions, 27 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index b6d79d41f2..2ada86beca 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -117,16 +117,6 @@ uint32_t DisplayDevice::getPageFlipCount() const { } // ---------------------------------------------------------------------------- - -void DisplayDevice::setVisibleLayersSortedByZ(const Vector< sp<Layer> >& layers) { - mVisibleLayersSortedByZ = layers; -} - -const Vector< sp<Layer> >& DisplayDevice::getVisibleLayersSortedByZ() const { - return mVisibleLayersSortedByZ; -} - -// ---------------------------------------------------------------------------- void DisplayDevice::setPowerMode(int mode) { mPowerMode = mode; getCompositionDisplay()->setCompositionEnabled(mPowerMode != HWC_POWER_MODE_OFF); @@ -291,7 +281,6 @@ void DisplayDevice::dump(std::string& result) const { result.append(" "); StringAppendF(&result, "powerMode=%d, ", mPowerMode); StringAppendF(&result, "activeConfig=%d, ", mActiveConfig); - StringAppendF(&result, "numLayers=%zu\n", mVisibleLayersSortedByZ.size()); getCompositionDisplay()->dump(result); } diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index 4321e3dd13..52773204b9 100644 --- a/services/surfaceflinger/DisplayDevice.h +++ b/services/surfaceflinger/DisplayDevice.h @@ -87,9 +87,6 @@ public: int getHeight() const; int getInstallOrientation() const { return mDisplayInstallOrientation; } - void setVisibleLayersSortedByZ(const Vector< sp<Layer> >& layers); - const Vector< sp<Layer> >& getVisibleLayersSortedByZ() const; - void setLayerStack(uint32_t stack); void setDisplaySize(const int newWidth, const int newHeight); void setProjection(int orientation, const Rect& viewport, const Rect& frame); @@ -179,9 +176,6 @@ private: * don't need synchronization. */ - // list of visible layers on that display - Vector< sp<Layer> > mVisibleLayersSortedByZ; - /* * Transaction state */ diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index f0f373bb44..25a9d321c5 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -2095,7 +2095,6 @@ void SurfaceFlinger::rebuildLayerStacks() { Region dirtyRegion; compositionengine::Output::OutputLayers layersSortedByZ; compositionengine::Output::ReleasedLayers releasedLayers; - Vector<sp<Layer>> deprecated_layersSortedByZ; const ui::Transform& tr = displayState.transform; const Rect bounds = displayState.bounds; if (displayState.isEnabled) { @@ -2127,8 +2126,6 @@ void SurfaceFlinger::rebuildLayerStacks() { layersSortedByZ.emplace_back( display->getOrCreateOutputLayer(displayId, compositionLayer, layerFE)); - deprecated_layersSortedByZ.add(layer); - auto& outputLayerState = layersSortedByZ.back()->editState(); outputLayerState.visibleRegion = tr.transform(layer->visibleRegion.intersect(displayState.viewport)); @@ -2152,8 +2149,6 @@ void SurfaceFlinger::rebuildLayerStacks() { display->setOutputLayersOrderedByZ(std::move(layersSortedByZ)); display->setReleasedLayers(std::move(releasedLayers)); - displayDevice->setVisibleLayersSortedByZ(deprecated_layersSortedByZ); - Region undefinedRegion{bounds}; undefinedRegion.subtractSelf(tr.transform(opaqueRegion)); diff --git a/services/surfaceflinger/tests/unittests/CompositionTest.cpp b/services/surfaceflinger/tests/unittests/CompositionTest.cpp index 2e64a78458..425768e244 100644 --- a/services/surfaceflinger/tests/unittests/CompositionTest.cpp +++ b/services/surfaceflinger/tests/unittests/CompositionTest.cpp @@ -805,9 +805,6 @@ struct BaseLayerVariant { Mock::VerifyAndClear(test->mComposer); - Vector<sp<Layer>> layers; - layers.add(layer); - test->mDisplay->setVisibleLayersSortedByZ(layers); test->mFlinger.mutableDrawingState().layersSortedByZ.add(layer); } @@ -1096,8 +1093,6 @@ struct CompositionCase { for (auto& hwcDisplay : test->mFlinger.mFakeHwcDisplays) { hwcDisplay->mutableLayers().clear(); } - - test->mDisplay->setVisibleLayersSortedByZ(Vector<sp<android::Layer>>()); } }; |