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

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

Merge "Fix vts cases due to function change for async render engine."

parents 36b6d088 03f344fe
Loading
Loading
Loading
Loading
+7 −7
Original line number Original line Diff line number Diff line
@@ -61,18 +61,18 @@ void TestRenderEngine::initGraphicBuffer(uint32_t width, uint32_t height, uint32
void TestRenderEngine::drawLayers() {
void TestRenderEngine::drawLayers() {
    base::unique_fd bufferFence;
    base::unique_fd bufferFence;


    std::vector<const renderengine::LayerSettings*> compositionLayerPointers;
    std::vector<renderengine::LayerSettings> compositionLayers;
    compositionLayerPointers.reserve(mCompositionLayers.size());
    compositionLayers.reserve(mCompositionLayers.size());
    std::transform(mCompositionLayers.begin(), mCompositionLayers.end(),
    std::transform(mCompositionLayers.begin(), mCompositionLayers.end(),
                   std::back_insert_iterator(compositionLayerPointers),
                   std::back_insert_iterator(compositionLayers),
                   [](renderengine::LayerSettings& settings) -> renderengine::LayerSettings* {
                   [](renderengine::LayerSettings& settings) -> renderengine::LayerSettings {
                       return &settings;
                       return settings;
                   });
                   });
    auto texture = std::make_shared<renderengine::ExternalTexture>(
    auto texture = std::make_shared<renderengine::ExternalTexture>(
            mGraphicBuffer, *mRenderEngine, renderengine::ExternalTexture::Usage::WRITEABLE);
            mGraphicBuffer, *mRenderEngine, renderengine::ExternalTexture::Usage::WRITEABLE);
    auto [status, readyFence] = mRenderEngine
    auto [status, readyFence] = mRenderEngine
                                        ->drawLayers(mDisplaySettings, compositionLayerPointers,
                                        ->drawLayers(mDisplaySettings, compositionLayers, texture,
                                                     texture, true, std::move(bufferFence))
                                                     true, std::move(bufferFence))
                                        .get();
                                        .get();
    int fd = readyFence.release();
    int fd = readyFence.release();
    if (fd != -1) {
    if (fd != -1) {