| commit | 6a434a54ee15de0f35fc3fdd2ee862214353bceb | [log] [tgz] |
|---|---|---|
| author | Vishnu Nair <vishnun@google.com> | Mon Aug 01 18:24:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 01 18:24:58 2022 +0000 |
| tree | b196b19ab1e56236a77f4314a8b10e6487b8bf14 | |
| parent | 576b4683118d8262776df1b591d309c1744bd7a1 [diff] | |
| parent | 614343ae2ca622b8e83d1983da06d71ffd4d4727 [diff] |
CE: Pass the fence with the cached client composition buffer am: 3a49f0a4c5 am: 5e01f67053 am: 614343ae2c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19466663 Change-Id: Ibb1666e4c3ff86cbc8155291d1d71c20fe6235b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index aea6798..72922bb 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1288,7 +1288,8 @@ ATRACE_NAME("ClientCompositionCacheHit"); outputCompositionState.reusedClientComposition = true; setExpensiveRenderingExpected(false); - return base::unique_fd(); + // b/239944175 pass the fence associated with the buffer. + return base::unique_fd(std::move(fd)); } ATRACE_NAME("ClientCompositionCacheMiss"); mClientCompositionRequestCache->add(tex->getBuffer()->getId(), clientCompositionDisplay,