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

Commit 2d22f846 authored by Ram Indani's avatar Ram Indani Committed by Android (Google) Code Review
Browse files

Merge "[VTS] Removes wait on buffer fence"

parents 8af9317f 58ced4f5

graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp

+0 −10
Original line number Diff line number Diff line
@@ -565,11 +565,6 @@ TEST_P(GraphicsCompositionTest, ClientComposition) { 
            int32_t clientFence;

            const auto unlockStatus = graphicBuffer->unlockAsync(&clientFence);

            ASSERT_EQ(::android::OK, unlockStatus);

            if (clientFence >= 0) {

                sync_wait(clientFence, -1);

                close(clientFence);

            }



            mWriter.setClientTarget(getPrimaryDisplayId(), /*slot*/ 0, buffer, clientFence,

                                    clientDataspace, std::vector<common::Rect>(1, damage));

            layer->setToClientComposition(mWriter);
@@ -676,11 +671,6 @@ TEST_P(GraphicsCompositionTest, DeviceAndClientComposition) { 
        int32_t clientFence;

        const auto unlockStatus = graphicBuffer->unlockAsync(&clientFence);

        ASSERT_EQ(::android::OK, unlockStatus);

        if (clientFence >= 0) {

            sync_wait(clientFence, -1);

            close(clientFence);

        }



        mWriter.setClientTarget(getPrimaryDisplayId(), /*slot*/ 0, buffer, clientFence,

                                clientDataspace, std::vector<common::Rect>(1, clientFrame));

        clientLayer->setToClientComposition(mWriter);

graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/ReadbackVts.cpp

+0 −4
Original line number Diff line number Diff line
@@ -328,10 +328,6 @@ void TestBufferLayer::fillBuffer(std::vector<Color>& expectedColors) { 


    const auto unlockStatus = mGraphicBuffer->unlockAsync(&mFillFence);

    ASSERT_EQ(::android::OK, unlockStatus);

    if (mFillFence >= 0) {

        sync_wait(mFillFence, -1);

        close(mFillFence);

    }

}



void TestBufferLayer::setBuffer(std::vector<Color> colors) {