commit d515dbade2d02922131200d7cbfd7f1de58ce5e2
author Sally Qi <sallyqi@google.com> Tue Oct 12 18:53:23 2021 +0000
committer Sally Qi <sallyqi@google.com> Wed Oct 13 11:15:13 2021 -0700
tree 09bc1900a57cdba469789e50bf611e5257bb48f0
parent 36b6d0887e0635434610ed26b6ae7e64f1f2db8b

Revert "Revert "Fix vts cases due to function change for async r..."

Revert^2 "Second Patch for async RenderEngine"

2109270e74a18585aceffc94d1758cee47bb4175

Bug: 202843200
Bug: 202833127
Bug: 202808760
Test: this
Change-Id: I504d2974d97e78431dc5d7e572e8ae70690dc34c

graphics/composer/2.2/utils/vts/RenderEngineVts.cpp

diff --git a/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp b/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp
index fe59a9d..2d4cc7d 100644
--- a/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp
+++ b/graphics/composer/2.2/utils/vts/RenderEngineVts.cpp
@@ -61,18 +61,18 @@
 void TestRenderEngine::drawLayers() {
     base::unique_fd bufferFence;
 
-    std::vector<const renderengine::LayerSettings*> compositionLayerPointers;
-    compositionLayerPointers.reserve(mCompositionLayers.size());
+    std::vector<renderengine::LayerSettings> compositionLayers;
+    compositionLayers.reserve(mCompositionLayers.size());
     std::transform(mCompositionLayers.begin(), mCompositionLayers.end(),
-                   std::back_insert_iterator(compositionLayerPointers),
-                   [](renderengine::LayerSettings& settings) -> renderengine::LayerSettings* {
-                       return &settings;
+                   std::back_insert_iterator(compositionLayers),
+                   [](renderengine::LayerSettings& settings) -> renderengine::LayerSettings {
+                       return settings;
                    });
     auto texture = std::make_shared<renderengine::ExternalTexture>(
             mGraphicBuffer, *mRenderEngine, renderengine::ExternalTexture::Usage::WRITEABLE);
     auto [status, readyFence] = mRenderEngine
-                                        ->drawLayers(mDisplaySettings, compositionLayerPointers,
-                                                     texture, true, std::move(bufferFence))
+                                        ->drawLayers(mDisplaySettings, compositionLayers, texture,
+                                                     true, std::move(bufferFence))
                                         .get();
     int fd = readyFence.release();
     if (fd != -1) {