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

Commit 4fe29408 authored by Lloyd Pique's avatar Lloyd Pique
Browse files

SF: Verify mDebugDisableHWC forces client composition 

Add a composition test to verify that setting setting mDebugDisableHWC
to true causes client composition to be performed.

Test: atest libsurfaceflinger_unittest
Bug: None
Change-Id: Iad5e8fbe4d77ba61460e03c5dfa9c0686e11fcc5
parent f729f507

services/surfaceflinger/tests/unittests/CompositionTest.cpp

+38 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,26 @@ struct ForcedClientCompositionResultVariant : public CompositionResultBaseVarian 
    static void setupCallExpectationsForDirtyFrame(CompositionTest*) {}

};



struct ForcedClientCompositionViaDebugOptionResultVariant : public CompositionResultBaseVariant {

    static void setupLayerState(CompositionTest* test, sp<Layer>) {

        test->mFlinger.mutableDebugDisableHWC() = true;

    }



    template <typename Case>

    static void setupCallExpectations(CompositionTest* test) {

        Case::Display::setupNonEmptyFrameCompositionCallExpectations(test);

        Case::Display::setupHwcForcedClientCompositionCallExpectations(test);

        Case::Display::setupRECompositionCallExpectations(test);

        Case::Display::template setupRELayerCompositionCallExpectations<Case>(test);

    }



    template <typename Case>

    static void setupCallExpectationsForDirtyGeometry(CompositionTest*) {}



    template <typename Case>

    static void setupCallExpectationsForDirtyFrame(CompositionTest*) {}

};



struct EmptyScreenshotResultVariant {

    static void setupLayerState(CompositionTest*, sp<Layer>) {}
@@ -1350,5 +1370,23 @@ TEST_F(CompositionTest, captureScreenNormalBufferLayerOnPoweredOffDisplay) { 
            NoCompositionTypeVariant, REScreenshotResultVariant>>();

}



/* ------------------------------------------------------------------------

 *  Client composition forced through debug/developer settings

 */



TEST_F(CompositionTest, DebugOptionForcingClientCompositionOfBufferLayerWithDirtyGeometry) {

    displayRefreshCompositionDirtyGeometry<

            CompositionCase<DefaultDisplaySetupVariant, BufferLayerVariant<DefaultLayerProperties>,

                            KeepCompositionTypeVariant<IComposerClient::Composition::CLIENT>,

                            ForcedClientCompositionViaDebugOptionResultVariant>>();

}



TEST_F(CompositionTest, DebugOptionForcingClientCompositionOfBufferLayerWithDirtyFrame) {

    displayRefreshCompositionDirtyFrame<

            CompositionCase<DefaultDisplaySetupVariant, BufferLayerVariant<DefaultLayerProperties>,

                            KeepCompositionTypeVariant<IComposerClient::Composition::CLIENT>,

                            ForcedClientCompositionViaDebugOptionResultVariant>>();

}



} // namespace

} // namespace android

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ public: 
    auto& mutableTransactionFlags() { return mFlinger->mTransactionFlags; }

    auto& mutableUseHwcVirtualDisplays() { return mFlinger->mUseHwcVirtualDisplays; }

    auto& mutablePowerAdvisor() { return mFlinger->mPowerAdvisor; }

    auto& mutableDebugDisableHWC() { return mFlinger->mDebugDisableHWC; }



    auto& mutableComposerSequenceId() { return mFlinger->getBE().mComposerSequenceId; }

    auto& mutableHwcDisplayData() { return getHwComposer().mDisplayData; }