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

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

test-hwc2: set layer surface damage 

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: Ie30032c7285d76d26e51b36b0cfded909f4c3480
parent 2a0aaf9f

services/surfaceflinger/tests/hwc2/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_CFLAGS += \ 
    -Wall -Wextra \

    -Werror \

    -fno-builtin

LOCAL_SHARED_LIBRARIES := libcutils libutils libhardware

LOCAL_SHARED_LIBRARIES := libcutils libutils libhardware liblog

LOCAL_STATIC_LIBRARIES := libbase libadf libadfhwc

LOCAL_SRC_FILES := \

    Hwc2Test.cpp \

services/surfaceflinger/tests/hwc2/Hwc2Test.cpp

+52 −0
Original line number Diff line number Diff line
@@ -473,6 +473,23 @@ public: 
        }

    }



    void setLayerSurfaceDamage(hwc2_display_t display, hwc2_layer_t layer,

            const hwc_region_t& surfaceDamage, hwc2_error_t* outErr = nullptr)

    {

        auto pfn = reinterpret_cast<HWC2_PFN_SET_LAYER_SURFACE_DAMAGE>(

                getFunction(HWC2_FUNCTION_SET_LAYER_SURFACE_DAMAGE));

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



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

                surfaceDamage));

        if (outErr) {

            *outErr = err;

        } else {

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

                    " damage";

        }

    }



    void setLayerTransform(hwc2_display_t display, hwc2_layer_t layer,

            hwc_transform_t transform, hwc2_error_t* outErr = nullptr)

    {
@@ -982,6 +999,13 @@ void setSourceCrop(Hwc2Test* test, hwc2_display_t display, hwc2_layer_t layer, 
            testLayer.getSourceCrop(), outErr));

}



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

        const Hwc2TestLayer& testLayer, hwc2_error_t* outErr)

{

    EXPECT_NO_FATAL_FAILURE(test->setLayerSurfaceDamage(display, layer,

            testLayer.getSurfaceDamage(), outErr));

}



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

        const Hwc2TestLayer& testLayer, hwc2_error_t* outErr)

{
@@ -1044,6 +1068,13 @@ bool advanceSourceCrop(Hwc2TestLayer* testLayer) 
    return testLayer->advanceBufferArea();

}



bool advanceSurfaceDamage(Hwc2TestLayer* testLayer)

{

    if (testLayer->advanceSurfaceDamage())

        return true;

    return testLayer->advanceBufferArea();

}



bool advanceTransform(Hwc2TestLayer* testLayer)

{

    return testLayer->advanceTransform();
@@ -2123,6 +2154,27 @@ TEST_F(Hwc2Test, SET_LAYER_SOURCE_CROP_bad_layer) 
            setSourceCrop));

}



/* TESTCASE: Tests that the HWC2 can set the surface damage of a layer. */

TEST_F(Hwc2Test, SET_LAYER_SURFACE_DAMAGE)

{

    ASSERT_NO_FATAL_FAILURE(setLayerProperty(Hwc2TestCoverage::Complete,

            setSurfaceDamage, advanceSurfaceDamage));

}



/* TESTCASE: Tests that the HWC2 can update the surface damage of a layer. */

TEST_F(Hwc2Test, SET_LAYER_SURFACE_DAMAGE_update)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyUpdate(Hwc2TestCoverage::Complete,

            setSurfaceDamage, advanceSurfaceDamage));

}



/* TESTCASE: Tests that the HWC2 cannot set the surface damage of a bad layer. */

TEST_F(Hwc2Test, SET_LAYER_SURFACE_DAMAGE_bad_layer)

{

    ASSERT_NO_FATAL_FAILURE(setLayerPropertyBadLayer(Hwc2TestCoverage::Default,

            setSurfaceDamage));

}



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

TEST_F(Hwc2Test, SET_LAYER_TRANSFORM)

{

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp

+12 −0
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@ Hwc2TestLayer::Hwc2TestLayer(Hwc2TestCoverage coverage, const Area& displayArea, 
      mDisplayFrame(coverage, displayArea),

      mPlaneAlpha(coverage),

      mSourceCrop(coverage),

      mSurfaceDamage(coverage),

      mTransform(coverage),

      mZOrder(zOrder)

{

    mBufferArea.setDependent(&mSourceCrop);

    mBufferArea.setDependent(&mSurfaceDamage);

    mBlendMode.setDependent(&mColor);

}
@@ -98,6 +100,11 @@ hwc_frect_t Hwc2TestLayer::getSourceCrop() const 
    return mSourceCrop.get();

}



hwc_region_t Hwc2TestLayer::getSurfaceDamage() const

{

    return mSurfaceDamage.get();

}



hwc_transform_t Hwc2TestLayer::getTransform() const

{

    return mTransform.get();
@@ -153,6 +160,11 @@ bool Hwc2TestLayer::advanceSourceCrop() 
    return mSourceCrop.advance();

}



bool Hwc2TestLayer::advanceSurfaceDamage()

{

    return mSurfaceDamage.advance();

}



bool Hwc2TestLayer::advanceTransform()

{

    return mTransform.advance();

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h

+5 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public: 
    hwc_rect_t             getDisplayFrame() const;

    float                  getPlaneAlpha() const;

    hwc_frect_t            getSourceCrop() const;

    hwc_region_t           getSurfaceDamage() const;

    hwc_transform_t        getTransform() const;

    uint32_t               getZOrder() const;
@@ -54,12 +55,13 @@ public: 
    bool advanceDisplayFrame();

    bool advancePlaneAlpha();

    bool advanceSourceCrop();

    bool advanceSurfaceDamage();

    bool advanceTransform();



private:

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

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

        &mBlendMode, &mColor, &mComposition, &mDataspace, &mDisplayFrame,

        &mPlaneAlpha, &mSourceCrop, &mTransform

        &mPlaneAlpha, &mSourceCrop, &mSurfaceDamage, &mTransform

    }};



    Hwc2TestBlendMode mBlendMode;
@@ -70,6 +72,7 @@ private: 
    Hwc2TestDisplayFrame mDisplayFrame;

    Hwc2TestPlaneAlpha mPlaneAlpha;

    Hwc2TestSourceCrop mSourceCrop;

    Hwc2TestSurfaceDamage mSurfaceDamage;

    Hwc2TestTransform mTransform;



    uint32_t mZOrder;

services/surfaceflinger/tests/hwc2/Hwc2TestProperties.cpp

+111 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <sstream>

#include <cutils/log.h>



#include "Hwc2TestProperties.h"
@@ -41,7 +42,17 @@ std::string Hwc2TestBufferArea::dump() const 
void Hwc2TestBufferArea::setDependent(Hwc2TestSourceCrop* sourceCrop)

{

    mSourceCrop = sourceCrop;

    updateDependents();

    if (mSourceCrop) {

        mSourceCrop->updateBufferArea(get());

    }

}



void Hwc2TestBufferArea::setDependent(Hwc2TestSurfaceDamage* surfaceDamage)

{

    mSurfaceDamage = surfaceDamage;

    if (mSurfaceDamage) {

        mSurfaceDamage->updateBufferArea(get());

    }

}



void Hwc2TestBufferArea::update()
@@ -67,6 +78,8 @@ void Hwc2TestBufferArea::updateDependents() 


    if (mSourceCrop)

        mSourceCrop->updateBufferArea(curr);

    if (mSurfaceDamage)

        mSurfaceDamage->updateBufferArea(curr);

}



const std::vector<float> Hwc2TestBufferArea::mDefaultScalars = {
@@ -438,6 +451,103 @@ const std::vector<hwc_frect_t> Hwc2TestSourceCrop::mCompleteFrectScalars = { 
};





Hwc2TestSurfaceDamage::Hwc2TestSurfaceDamage(Hwc2TestCoverage coverage)

    : Hwc2TestProperty(mSurfaceDamages),

      mRegionScalars((coverage == Hwc2TestCoverage::Complete)? mCompleteRegionScalars:

            (coverage == Hwc2TestCoverage::Basic)? mBasicRegionScalars:

            mDefaultRegionScalars)

{

    update();

}



Hwc2TestSurfaceDamage::~Hwc2TestSurfaceDamage()

{

    freeSurfaceDamages();

}



std::string Hwc2TestSurfaceDamage::dump() const

{

    std::stringstream dmp;



    const hwc_region_t& curr = get();

    dmp << "\tsurface damage: region count " << curr.numRects << "\n";

    for (size_t i = 0; i < curr.numRects; i++) {

        const hwc_rect_t& rect = curr.rects[i];

        dmp << "\t\trect: left " << rect.left << ", top " << rect.top

                << ", right " << rect.right << ", bottom " << rect.bottom << "\n";

    }



    return dmp.str();

}



void Hwc2TestSurfaceDamage::updateBufferArea(const Area& bufferArea)

{

    mBufferArea = bufferArea;

    update();

}



void Hwc2TestSurfaceDamage::update()

{

    freeSurfaceDamages();



    if (mBufferArea.width == 0 && mBufferArea.height == 0) {

        mSurfaceDamages.push_back({0, nullptr});

        return;

    }



    hwc_region_t damage;



    for (const auto& regionScalar : mRegionScalars) {

        damage.numRects = regionScalar.size();



        if (damage.numRects > 0) {

            hwc_rect_t* rects = new hwc_rect_t[damage.numRects];

            if (!rects) {

                ALOGW("failed to allocate new hwc_rect_t array");

                continue;

            }



            for (size_t i = 0; i < damage.numRects; i++) {

                rects[i].left = regionScalar[i].left * mBufferArea.width;

                rects[i].top = regionScalar[i].top * mBufferArea.height;

                rects[i].right = regionScalar[i].right * mBufferArea.width;

                rects[i].bottom = regionScalar[i].bottom * mBufferArea.height;

            }



            damage.rects = static_cast<hwc_rect_t const*>(rects);

        } else {

            damage.rects = nullptr;

        }



        mSurfaceDamages.push_back(damage);

    }

}



void Hwc2TestSurfaceDamage::freeSurfaceDamages()

{

    for (const auto& surfaceDamage : mSurfaceDamages) {

        if (surfaceDamage.numRects > 0 && surfaceDamage.rects)

            delete[] surfaceDamage.rects;

    }

    mSurfaceDamages.clear();

}



const std::vector<std::vector<hwc_frect_t>> Hwc2TestSurfaceDamage::mDefaultRegionScalars = {

    {{}},

};



const std::vector<std::vector<hwc_frect_t>> Hwc2TestSurfaceDamage::mBasicRegionScalars = {

    {{}},

    {{0.0, 0.0, 1.0, 1.0}},

};



const std::vector<std::vector<hwc_frect_t>> Hwc2TestSurfaceDamage::mCompleteRegionScalars = {

    {{}},

    {{0.0, 0.0, 1.0, 1.0}},

    {{0.0, 0.0, 0.5, 0.5}, {0.5, 0.5, 1.0, 1.0}},

};





Hwc2TestTransform::Hwc2TestTransform(Hwc2TestCoverage coverage)

    : Hwc2TestProperty(coverage, mCompleteTransforms, mBasicTransforms,

            mDefaultTransforms) { }