Merge "Revert "Fix vts cases due to function change for async render en...""
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) {