| commit | 614343ae2ca622b8e83d1983da06d71ffd4d4727 | [log] [tgz] |
|---|---|---|
| author | Vishnu Nair <vishnun@google.com> | Mon Aug 01 18:07:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 01 18:07:36 2022 +0000 |
| tree | 14d12aadefe368bea8af7a9b2400de23c5642c18 | |
| parent | b878ded4b306b5a8ac87d7308d2c74cb8e6b212b [diff] | |
| parent | 5e01f670532e9084db5da559422ea3db4e0a84e6 [diff] |
CE: Pass the fence with the cached client composition buffer am: 3a49f0a4c5 am: 5e01f67053 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19466663 Change-Id: I51d3330639677203a88d7995114e94d1ac787671 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 aa0b152..bc11d87 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1243,7 +1243,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,