Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b35e2ee9 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

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

parents 817f2cd2 d515dbad
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -61,18 +61,18 @@ void TestRenderEngine::initGraphicBuffer(uint32_t width, uint32_t height, uint32
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) {