summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/BufferStateLayer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-17 14:54:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-05-17 14:54:32 +0000
commit1c94d263dae07cf58f76b1612f8f0a00d6d75fe3 (patch)
treeed66cc20d1e8294bab537860923f6cd663c4fc5b /services/surfaceflinger/BufferStateLayer.cpp
parent4d0354932995489267e30d6cf265acf6d364b6ed (diff)
parentbb448ce9aa521f9574d94c9ec2d57eb7d37382cb (diff)
Merge "SF: Do not duplicate fences per layer per frame" into tm-dev
Diffstat (limited to 'services/surfaceflinger/BufferStateLayer.cpp')
-rw-r--r--services/surfaceflinger/BufferStateLayer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index af0039cd2c..e58b65ec06 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -73,8 +73,7 @@ BufferStateLayer::~BufferStateLayer() {
// -----------------------------------------------------------------------
// Interface implementation for Layer
// -----------------------------------------------------------------------
-void BufferStateLayer::onLayerDisplayed(
- std::shared_future<renderengine::RenderEngineResult> futureRenderEngineResult) {
+void BufferStateLayer::onLayerDisplayed(std::shared_future<FenceResult> futureFenceResult) {
// If we are displayed on multiple displays in a single composition cycle then we would
// need to do careful tracking to enable the use of the mLastClientCompositionFence.
// For example we can only use it if all the displays are client comp, and we need
@@ -118,7 +117,7 @@ void BufferStateLayer::onLayerDisplayed(
if (ch != nullptr) {
ch->previousReleaseCallbackId = mPreviousReleaseCallbackId;
- ch->previousReleaseFences.emplace_back(futureRenderEngineResult);
+ ch->previousReleaseFences.emplace_back(std::move(futureFenceResult));
ch->name = mName;
}
}