commit 2e9748ff11588f10cdf011bcc4709e575c50508d
author Patrick Williams <pdwilliams@google.com> Tue Aug 09 22:48:18 2022 +0000
committer Patrick Williams <pdwilliams@google.com> Wed Aug 24 20:27:15 2022 +0000
tree 844ff435c0fa1f0870b27471539a288618ea64da
parent 4e6f0de7bb4abfe34d254a95f5707e05c7bb93a7

Replace RenderEngineResult with FenceResult

Bug: b/232535621
Test: atest librenderengine_test
Test: atest SurfaceFlinger_test

Change-Id: If036ab847024751b8da97d6ed856db447db19f6f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e1fcaa0..bdc8406 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6615,13 +6615,11 @@
     getRenderEngine().useProtectedContext(useProtected);
 
     constexpr bool kUseFramebufferCache = false;
-    auto chain =
-            ftl::Future(getRenderEngine().drawLayers(clientCompositionDisplay,
-                                                     clientRenderEngineLayers, buffer,
-                                                     kUseFramebufferCache, std::move(bufferFence)))
-                    .then(&toFenceResult);
+    const auto future = getRenderEngine()
+                                .drawLayers(clientCompositionDisplay, clientRenderEngineLayers,
+                                            buffer, kUseFramebufferCache, std::move(bufferFence))
+                                .share();
 
-    const auto future = chain.share();
     for (auto* layer : renderedLayers) {
         layer->onLayerDisplayed(future);
     }