commit 33c0b8d83e63e2c2b900642366efcdcc29f6e6db
author Vladimir Marko <vmarko@google.com> Tue Oct 12 12:43:47 2021 +0000
committer Vladimir Marko <vmarko@google.com> Tue Oct 12 17:15:09 2021 +0000
tree cb5310e88a1926672dafc4bae7722876e234be92
parent 03f344fe3bb373c9499eaa8b32a849452cbe0b59

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

Revert "Second Patch for async RenderEngine"

Revert "Fix vender implementation due to second patch of async R..."

Revert submission 15644535-asyncRenderEngineV2

Reason for revert: Broke multiple tests
Reverted Changes:
I772122750:Fix vts cases due to function change for async ren...
I615f2927d:Second Patch for async RenderEngine
I3f47b8b67:Fix vender implementation due to second patch of a...

Bug: 202803359
Bug: 202808760
Change-Id: I0313622b2d879ca3a3e63ff52458b51100748a29

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 2d4cc7d..fe59a9d 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<renderengine::LayerSettings> compositionLayers;
-    compositionLayers.reserve(mCompositionLayers.size());
+    std::vector<const renderengine::LayerSettings*> compositionLayerPointers;
+    compositionLayerPointers.reserve(mCompositionLayers.size());
     std::transform(mCompositionLayers.begin(), mCompositionLayers.end(),
-                   std::back_insert_iterator(compositionLayers),
-                   [](renderengine::LayerSettings& settings) -> renderengine::LayerSettings {
-                       return settings;
+                   std::back_insert_iterator(compositionLayerPointers),
+                   [](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, compositionLayers, texture,
-                                                     true, std::move(bufferFence))
+                                        ->drawLayers(mDisplaySettings, compositionLayerPointers,
+                                                     texture, true, std::move(bufferFence))
                                         .get();
     int fd = readyFence.release();
     if (fd != -1) {