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

Commit 2b1f5306 authored by Marissa Wall's avatar Marissa Wall
Browse files

test-hwc2: set layer plane alpha 

Test: Add "#define HAVE_NO_SURFACE_FLINGER" to
          frameworks/native/libs/gui/BufferQueueCore.cpp.
      Recompile and flash.
      Run "mm" in frameworks/native/services/surfaceflinger/tests/hwc2.
      Push test-hwc2 to device.
      Run "adb root && adb shell stop".
      Run test case. Ex: "./test-hwc2"

Change-Id: I48146953f745dc650ead5a6e9d6f456cf5a9d7ef
parent b72b5c9e

services/surfaceflinger/tests/hwc2/Hwc2Test.cpp

+58 −0
Original line number Diff line number Diff line
@@ -390,6 +390,23 @@ public: 
        }

    }



    void setLayerPlaneAlpha(hwc2_display_t display, hwc2_layer_t layer,

            float alpha, hwc2_error_t* outErr = nullptr)

    {

        auto pfn = reinterpret_cast<HWC2_PFN_SET_LAYER_PLANE_ALPHA>(

                getFunction(HWC2_FUNCTION_SET_LAYER_PLANE_ALPHA));

        ASSERT_TRUE(pfn) << "failed to get function";



        auto err = static_cast<hwc2_error_t>(pfn(mHwc2Device, display, layer,

                alpha));

        if (outErr) {

            *outErr = err;

        } else {

            ASSERT_EQ(err, HWC2_ERROR_NONE) << "failed to set layer plane alpha "

                    << alpha;

        }

    }



protected:

    hwc2_function_pointer_t getFunction(hwc2_function_descriptor_t descriptor)

    {
@@ -751,6 +768,15 @@ void setDataspace(Hwc2Test* test, hwc2_display_t display, hwc2_layer_t layer, 
            testLayer.getDataspace(), outErr));

}



void setPlaneAlpha(Hwc2Test* test, hwc2_display_t display, hwc2_layer_t layer,

        const Hwc2TestLayer& testLayer, hwc2_error_t *outErr)

{

    ASSERT_NO_FATAL_FAILURE(test->setLayerBlendMode(display, layer,

            testLayer.getBlendMode()));

    EXPECT_NO_FATAL_FAILURE(test->setLayerPlaneAlpha(display, layer,

            testLayer.getPlaneAlpha(), outErr));

}



bool advanceBlendMode(Hwc2TestLayer* testLayer)

{

    return testLayer->advanceBlendMode();
@@ -766,6 +792,11 @@ bool advanceDataspace(Hwc2TestLayer* testLayer) 
    return testLayer->advanceDataspace();

}



bool advancePlaneAlpha(Hwc2TestLayer* testLayer)

{

    return testLayer->advancePlaneAlpha();

}





static const std::array<hwc2_function_descriptor_t, 42> requiredFunctions = {{

    HWC2_FUNCTION_ACCEPT_DISPLAY_CHANGES,
@@ -1668,3 +1699,30 @@ TEST_F(Hwc2Test, SET_LAYER_DATASPACE_bad_layer) 
    ASSERT_NO_FATAL_FAILURE(setLayerPropertyBadLayer(Hwc2TestCoverage::Default,

            setDataspace));

}



/* TESTCASE: Tests that the HWC2 can set the plane alpha of a layer. */

TEST_F(Hwc2Test, SET_LAYER_PLANE_ALPHA)

{

    ASSERT_NO_FATAL_FAILURE(setLayerProperty(Hwc2TestCoverage::Complete,

            setPlaneAlpha, advancePlaneAlpha));

}



/* TESTCASE: Tests that the HWC2 can update the plane alpha of a layer. */

TEST_F(Hwc2Test, SET_LAYER_PLANE_ALPHA_update)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyUpdate(Hwc2TestCoverage::Complete,

            setPlaneAlpha, advancePlaneAlpha));

}



/* TESTCASE: Tests that the HWC2 cannot set a plane alpha for a bad layer. */

TEST_F(Hwc2Test, SET_LAYER_PLANE_ALPHA_bad_layer)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyBadLayer(Hwc2TestCoverage::Default,

            [] (Hwc2Test* test, hwc2_display_t display, hwc2_layer_t badLayer,

                    const Hwc2TestLayer& testLayer, hwc2_error_t *outErr) {



                    EXPECT_NO_FATAL_FAILURE(test->setLayerPlaneAlpha(display,

                            badLayer, testLayer.getPlaneAlpha(), outErr));

            }

    ));

}

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp

+12 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
Hwc2TestLayer::Hwc2TestLayer(Hwc2TestCoverage coverage)

    : mBlendMode(coverage),

      mComposition(coverage),

      mDataspace(coverage) { }

      mDataspace(coverage),

      mPlaneAlpha(coverage) { }



std::string Hwc2TestLayer::dump() const

{
@@ -58,6 +59,11 @@ android_dataspace_t Hwc2TestLayer::getDataspace() const 
    return mDataspace.get();

}



float Hwc2TestLayer::getPlaneAlpha() const

{

    return mPlaneAlpha.get();

}



bool Hwc2TestLayer::advanceBlendMode()

{

    return mBlendMode.advance();
@@ -72,3 +78,8 @@ bool Hwc2TestLayer::advanceDataspace() 
{

    return mDataspace.advance();

}



bool Hwc2TestLayer::advancePlaneAlpha()

{

    return mPlaneAlpha.advance();

}

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h

+5 −2
Original line number Diff line number Diff line
@@ -36,19 +36,22 @@ public: 
    hwc2_blend_mode_t      getBlendMode() const;

    hwc2_composition_t     getComposition() const;

    android_dataspace_t    getDataspace() const;

    float                  getPlaneAlpha() const;



    bool advanceBlendMode();

    bool advanceComposition();

    bool advanceDataspace();

    bool advancePlaneAlpha();



private:

    std::array<Hwc2TestContainer*, 3> mProperties = {{

        &mBlendMode, &mComposition, &mDataspace

    std::array<Hwc2TestContainer*, 4> mProperties = {{

        &mBlendMode, &mComposition, &mDataspace, &mPlaneAlpha

    }};



    Hwc2TestBlendMode mBlendMode;

    Hwc2TestComposition mComposition;

    Hwc2TestDataspace mDataspace;

    Hwc2TestPlaneAlpha mPlaneAlpha;

};



#endif /* ifndef _HWC2_TEST_LAYER_H */

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp

+24 −0
Original line number Diff line number Diff line
@@ -138,3 +138,27 @@ const std::vector<android_dataspace_t> Hwc2TestDataspace::completeDataspaces = { 
    HAL_DATASPACE_V0_BT709,

    HAL_DATASPACE_DEPTH,

};





Hwc2TestPlaneAlpha::Hwc2TestPlaneAlpha(Hwc2TestCoverage coverage)

    : Hwc2TestProperty(coverage, mCompletePlaneAlphas, mBasicPlaneAlphas,

            mDefaultPlaneAlphas) { }



std::string Hwc2TestPlaneAlpha::dump() const

{

    std::stringstream dmp;

    dmp << "\tplane alpha: " << get() << "\n";

    return dmp.str();

}



const std::vector<float> Hwc2TestPlaneAlpha::mDefaultPlaneAlphas = {

    1.0f,

};



const std::vector<float> Hwc2TestPlaneAlpha::mBasicPlaneAlphas = {

    1.0f, 0.0f,

};



const std::vector<float> Hwc2TestPlaneAlpha::mCompletePlaneAlphas = {

    1.0f, 0.75f, 0.5f, 0.25f, 0.0f,

};

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h

+13 −0
Original line number Diff line number Diff line
@@ -124,4 +124,17 @@ protected: 
    static const std::vector<android_dataspace_t> completeDataspaces;

};





class Hwc2TestPlaneAlpha : public Hwc2TestProperty<float> {

public:

    Hwc2TestPlaneAlpha(Hwc2TestCoverage coverage);



    std::string dump() const override;



protected:

    static const std::vector<float> mDefaultPlaneAlphas;

    static const std::vector<float> mBasicPlaneAlphas;

    static const std::vector<float> mCompletePlaneAlphas;

};



#endif /* ifndef _HWC2_TEST_PROPERTIES_H */