diff options
| author | 2023-05-23 23:57:56 +0000 | |
|---|---|---|
| committer | 2023-05-23 23:57:56 +0000 | |
| commit | a0ec532d6206cfaef28d2ecbd1fa7985b9727106 (patch) | |
| tree | 65f0d8fa9437113ce742f7aba06afa8ae77590e2 | |
| parent | 6eef85eef188c92f35ae1ba3741a298e19c953c2 (diff) | |
| parent | a482b289b80d47858744db7d95945f166711664f (diff) | |
Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb50406 am: a482b289b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23377686
Change-Id: I142e262732e9f68081d6b77c24e95b515cd1ab94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/surfaceflinger/Layer.h | 3 | ||||
| -rw-r--r-- | services/surfaceflinger/LayerRenderArea.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 38590e6f20..f7596e20e5 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -877,6 +877,7 @@ public: // TODO(b/238781169) Remove direct calls to RenderEngine::drawLayers that don't go through // CompositionEngine to create a single path for composing layers. void updateSnapshot(bool updateGeometry); + void updateChildrenSnapshots(bool updateGeometry); void updateMetadataSnapshot(const LayerMetadata& parentMetadata); void updateRelativeMetadataSnapshot(const LayerMetadata& relativeLayerMetadata, std::unordered_set<Layer*>& visited); @@ -1134,8 +1135,6 @@ private: bool hasSomethingToDraw() const { return hasEffect() || hasBufferOrSidebandStream(); } - void updateChildrenSnapshots(bool updateGeometry); - // Fills the provided vector with the currently available JankData and removes the processed // JankData from the pending list. void transferAvailableJankData(const std::deque<sp<CallbackHandle>>& handles, diff --git a/services/surfaceflinger/LayerRenderArea.cpp b/services/surfaceflinger/LayerRenderArea.cpp index d606cffe40..51d4ff854f 100644 --- a/services/surfaceflinger/LayerRenderArea.cpp +++ b/services/surfaceflinger/LayerRenderArea.cpp @@ -116,6 +116,8 @@ void LayerRenderArea::render(std::function<void()> drawLayers) { mLayer->setChildrenDrawingParent(mLayer); } } + mLayer->updateSnapshot(/*updateGeometry=*/true); + mLayer->updateChildrenSnapshots(/*updateGeometry=*/true); } } // namespace android |