commit 0a525a4567bca5917bba8808edb451e16c60d8bf
author Patrick Williams <pdwilliams@google.com> Wed Oct 26 20:20:50 2022 +0000
committer Patrick Williams <pdwilliams@google.com> Mon Oct 31 19:34:42 2022 +0000
tree 06f38bd3652fac798c52f295d8d6178f5aff5f08
parent 15c01e27967cbf5df7dd0c6adb3059063c4d05be

SF: Change RenderEngine ownership

This change allows multiple instances of CompositionEngine to use
the same RenderEngine instance which enables creating new instances of
CompositionEngine to run off the main thread. This will be used in the
refactor of SurfaceFlinger::renderScreenImpl to generate LayerSettings
via CompositionEngine.

Bug: 238643986
Test: presubmits

Change-Id: I0c8dc30e091578d0d77afb434a52038db6e82288

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cfebec7..610732e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -602,7 +602,7 @@
 }
 
 renderengine::RenderEngine& SurfaceFlinger::getRenderEngine() const {
-    return mCompositionEngine->getRenderEngine();
+    return *mRenderEngine;
 }
 
 compositionengine::CompositionEngine& SurfaceFlinger::getCompositionEngine() const {
@@ -763,7 +763,8 @@
     if (auto type = chooseRenderEngineTypeViaSysProp()) {
         builder.setRenderEngineType(type.value());
     }
-    mCompositionEngine->setRenderEngine(renderengine::RenderEngine::create(builder.build()));
+    mRenderEngine = renderengine::RenderEngine::create(builder.build());
+    mCompositionEngine->setRenderEngine(mRenderEngine.get());
     mMaxRenderTargetSize =
             std::min(getRenderEngine().getMaxTextureSize(), getRenderEngine().getMaxViewportDims());