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

Commit ac108193 authored by Marissa Wall's avatar Marissa Wall
Browse files

test-hwc2: set layer transform 

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: I55e318cbddf957d1728435488c6283f8ce77a3d6
parent 2b1f5306

services/surfaceflinger/tests/hwc2/Hwc2Test.cpp

+50 −0
Original line number Diff line number Diff line
@@ -407,6 +407,23 @@ public: 
        }

    }



    void setLayerTransform(hwc2_display_t display, hwc2_layer_t layer,

            hwc_transform_t transform, hwc2_error_t* outErr = nullptr)

    {

        auto pfn = reinterpret_cast<HWC2_PFN_SET_LAYER_TRANSFORM>(

                getFunction(HWC2_FUNCTION_SET_LAYER_TRANSFORM));

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



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

                transform));

        if (outErr) {

            *outErr = err;

        } else {

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

                    << getTransformName(transform);

        }

    }



protected:

    hwc2_function_pointer_t getFunction(hwc2_function_descriptor_t descriptor)

    {
@@ -777,6 +794,13 @@ void setPlaneAlpha(Hwc2Test* test, hwc2_display_t display, hwc2_layer_t layer, 
            testLayer.getPlaneAlpha(), outErr));

}



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

        const Hwc2TestLayer& testLayer, hwc2_error_t* outErr)

{

    EXPECT_NO_FATAL_FAILURE(test->setLayerTransform(display, layer,

            testLayer.getTransform(), outErr));

}



bool advanceBlendMode(Hwc2TestLayer* testLayer)

{

    return testLayer->advanceBlendMode();
@@ -797,6 +821,11 @@ bool advancePlaneAlpha(Hwc2TestLayer* testLayer) 
    return testLayer->advancePlaneAlpha();

}



bool advanceTransform(Hwc2TestLayer* testLayer)

{

    return testLayer->advanceTransform();

}





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

    HWC2_FUNCTION_ACCEPT_DISPLAY_CHANGES,
@@ -1726,3 +1755,24 @@ TEST_F(Hwc2Test, SET_LAYER_PLANE_ALPHA_bad_layer) 
            }

    ));

}



/* TESTCASE: Tests that the HWC2 can set the transform value of a layer. */

TEST_F(Hwc2Test, SET_LAYER_TRANSFORM)

{

    ASSERT_NO_FATAL_FAILURE(setLayerProperty(Hwc2TestCoverage::Complete,

            setTransform, advanceTransform));

}



/* TESTCASE: Tests that the HWC2 can update the transform value of a layer. */

TEST_F(Hwc2Test, SET_LAYER_TRANSFORM_update)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyUpdate(Hwc2TestCoverage::Complete,

            setTransform, advanceTransform));

}



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

TEST_F(Hwc2Test, SET_LAYER_TRANSFORM_bad_layer)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyBadLayer(Hwc2TestCoverage::Default,

            setTransform));

}

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp

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

      mComposition(coverage),

      mDataspace(coverage),

      mPlaneAlpha(coverage) { }

      mPlaneAlpha(coverage),

      mTransform(coverage) { }



std::string Hwc2TestLayer::dump() const

{
@@ -64,6 +65,11 @@ float Hwc2TestLayer::getPlaneAlpha() const 
    return mPlaneAlpha.get();

}



hwc_transform_t Hwc2TestLayer::getTransform() const

{

    return mTransform.get();

}



bool Hwc2TestLayer::advanceBlendMode()

{

    return mBlendMode.advance();
@@ -83,3 +89,8 @@ bool Hwc2TestLayer::advancePlaneAlpha() 
{

    return mPlaneAlpha.advance();

}



bool Hwc2TestLayer::advanceTransform()

{

    return mTransform.advance();

}

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h

+5 −2
Original line number Diff line number Diff line
@@ -37,21 +37,24 @@ public: 
    hwc2_composition_t     getComposition() const;

    android_dataspace_t    getDataspace() const;

    float                  getPlaneAlpha() const;

    hwc_transform_t        getTransform() const;



    bool advanceBlendMode();

    bool advanceComposition();

    bool advanceDataspace();

    bool advancePlaneAlpha();

    bool advanceTransform();



private:

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

        &mBlendMode, &mComposition, &mDataspace, &mPlaneAlpha

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

        &mBlendMode, &mComposition, &mDataspace, &mPlaneAlpha, &mTransform

    }};



    Hwc2TestBlendMode mBlendMode;

    Hwc2TestComposition mComposition;

    Hwc2TestDataspace mDataspace;

    Hwc2TestPlaneAlpha mPlaneAlpha;

    Hwc2TestTransform mTransform;

};



#endif /* ifndef _HWC2_TEST_LAYER_H */

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp

+34 −0
Original line number Diff line number Diff line
@@ -162,3 +162,37 @@ const std::vector<float> Hwc2TestPlaneAlpha::mBasicPlaneAlphas = { 
const std::vector<float> Hwc2TestPlaneAlpha::mCompletePlaneAlphas = {

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

};





Hwc2TestTransform::Hwc2TestTransform(Hwc2TestCoverage coverage)

    : Hwc2TestProperty(coverage, mCompleteTransforms, mBasicTransforms,

            mDefaultTransforms) { }



std::string Hwc2TestTransform::dump() const

{

    std::stringstream dmp;

    dmp << "\ttransform: " << getTransformName(get()) << "\n";

    return dmp.str();

}



const std::vector<hwc_transform_t> Hwc2TestTransform::mDefaultTransforms = {

    static_cast<hwc_transform_t>(0),

};



const std::vector<hwc_transform_t> Hwc2TestTransform::mBasicTransforms = {

    static_cast<hwc_transform_t>(0),

    HWC_TRANSFORM_FLIP_H,

    HWC_TRANSFORM_FLIP_V,

    HWC_TRANSFORM_ROT_90,

};



const std::vector<hwc_transform_t> Hwc2TestTransform::mCompleteTransforms = {

    static_cast<hwc_transform_t>(0),

    HWC_TRANSFORM_FLIP_H,

    HWC_TRANSFORM_FLIP_V,

    HWC_TRANSFORM_ROT_90,

    HWC_TRANSFORM_ROT_180,

    HWC_TRANSFORM_ROT_270,

    HWC_TRANSFORM_FLIP_H_ROT_90,

    HWC_TRANSFORM_FLIP_V_ROT_90,

};

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.h

+13 −0
Original line number Diff line number Diff line
@@ -137,4 +137,17 @@ protected: 
    static const std::vector<float> mCompletePlaneAlphas;

};





class Hwc2TestTransform : public Hwc2TestProperty<hwc_transform_t> {

public:

    Hwc2TestTransform(Hwc2TestCoverage coverage);



    std::string dump() const override;



protected:

    static const std::vector<hwc_transform_t> mDefaultTransforms;

    static const std::vector<hwc_transform_t> mBasicTransforms;

    static const std::vector<hwc_transform_t> mCompleteTransforms;

};



#endif /* ifndef _HWC2_TEST_PROPERTIES_H */