| commit | 5e01f670532e9084db5da559422ea3db4e0a84e6 | [log] [tgz] |
|---|---|---|
| author | Vishnu Nair <vishnun@google.com> | Mon Aug 01 17:51:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 01 17:51:50 2022 +0000 |
| tree | 040a9df530be55ed3a8cfd287d0a8a3d2cfd68ef | |
| parent | 9bcb646d88037abe9df9114509f6b9f309b4bdd6 [diff] | |
| parent | 3a49f0a4c5685162f430dc7fcd5c1a7967d007c8 [diff] |
CE: Pass the fence with the cached client composition buffer am: 3a49f0a4c5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19466663 Change-Id: Icb315f964d5eea38bcfd967227835e387f8b0313 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,