summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Carr <racarr@google.com>2022-06-28 01:46:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-28 01:46:54 +0000
commit4aaaed867629b61daaaf3ac9b11ca27a94463ed4 (patch)
tree2294ed17c4233b67ce2bdc608c03283b5832468a
parentbbca6678d9d530b70d6caa302c9d63077d790a1a (diff)
parent4ac285c63e05445167c9d0ffdb499794201c4422 (diff)
downloadnative-4aaaed867629b61daaaf3ac9b11ca27a94463ed4.tar.gz
Merge "SurfaceFlinger: Disable early release optimization" into tm-dev am: 4ac285c63e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19050000 Change-Id: Ie650af833595486a80d83cd2c0668c695b98bbac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/surfaceflinger/BufferStateLayer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index fecf5ae059..3875f151cb 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -34,6 +34,8 @@
#include "FrameTracer/FrameTracer.h"
#include "TimeStats/TimeStats.h"
+#define EARLY_RELEASE_ENABLED false
+
namespace android {
using PresentState = frametimeline::SurfaceFrame::PresentState;
@@ -373,7 +375,7 @@ bool BufferStateLayer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>&
addSurfaceFrameDroppedForBuffer(mDrawingState.bufferSurfaceFrameTX);
mDrawingState.bufferSurfaceFrameTX.reset();
}
- } else if (mLastClientCompositionFence != nullptr) {
+ } else if (EARLY_RELEASE_ENABLED && mLastClientCompositionFence != nullptr) {
callReleaseBufferCallback(mDrawingState.releaseBufferListener,
mDrawingState.buffer->getBuffer(), mDrawingState.frameNumber,
mLastClientCompositionFence,