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

Commit f5f714aa authored by Mathias Agopian's avatar Mathias Agopian
Browse files

apply the projection's viewport to the visibleregion passed to hwc 

each desplay's projection's viewport essentially clips each layer,
so this should be reflected in the visibleregion passed to
h/w composer.

DisplayDevice getViewport and getFrame are now guaranteed to return
valid Rects.

Change-Id: I4c25f34fb26af10179eb26d429ca6c384c671e91
parent 5219a06d

services/surfaceflinger/DisplayDevice.cpp

+62 −63
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ void DisplayDevice::setVisibleLayersSortedByZ(const Vector< sp<LayerBase> >& lay 
    mSecureLayerVisible = false;

    size_t count = layers.size();

    for (size_t i=0 ; i<count ; i++) {

        if (layers[i]->isSecure()) {

        const sp<LayerBase>& layer(layers[i]);

        if (layer->isSecure()) {

            mSecureLayerVisible = true;

        }

    }
@@ -365,23 +366,15 @@ status_t DisplayDevice::orientationToTransfrom( 
}



void DisplayDevice::setProjection(int orientation,

        const Rect& viewport, const Rect& frame) {

    mOrientation = orientation;

    mViewport = viewport;

    mFrame = frame;

    updateGeometryTransform();

}

        const Rect& newViewport, const Rect& newFrame) {

    Rect viewport(newViewport);

    Rect frame(newFrame);



void DisplayDevice::updateGeometryTransform() {

    int w = mDisplayWidth;

    int h = mDisplayHeight;

    Transform TL, TP, R, S;

    if (DisplayDevice::orientationToTransfrom(

            mOrientation, w, h, &R) == NO_ERROR) {

        dirtyRegion.set(bounds());

    const int w = mDisplayWidth;

    const int h = mDisplayHeight;



        Rect viewport(mViewport);

        Rect frame(mFrame);

    Transform R;

    DisplayDevice::orientationToTransfrom(orientation, w, h, &R);



    if (!frame.isValid()) {

        // the destination frame can be invalid if it has never been set,
@@ -402,6 +395,9 @@ void DisplayDevice::updateGeometryTransform() { 
        }

    }



    dirtyRegion.set(getBounds());



    Transform TL, TP, S;

    float src_width  = viewport.width();

    float src_height = viewport.height();

    float dst_width  = frame.width();
@@ -428,11 +424,14 @@ void DisplayDevice::updateGeometryTransform() { 
    mNeedsFiltering = (!mGlobalTransform.preserveRects() ||

            (type >= Transform::SCALE));



        mScissor = mGlobalTransform.transform(mViewport);

    mScissor = mGlobalTransform.transform(viewport);

    if (mScissor.isEmpty()) {

        mScissor.set(getBounds());

    }

    }



    mOrientation = orientation;

    mViewport = viewport;

    mFrame = frame;

}



void DisplayDevice::dump(String8& result, char* buffer, size_t SIZE) const {

services/surfaceflinger/DisplayDevice.h

+2 −4
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ public: 


    int                     getOrientation() const { return mOrientation; }

    const Transform&        getTransform() const { return mGlobalTransform; }

    const Rect&             getViewport() const { return mViewport; }

    const Rect&             getFrame() const { return mFrame; }

    const Rect              getViewport() const { return mViewport; }

    const Rect              getFrame() const { return mFrame; }

    const Rect&             getScissor() const { return mScissor; }

    bool                    needsFiltering() const { return mNeedsFiltering; }
@@ -197,8 +197,6 @@ private: 
    static status_t orientationToTransfrom(int orientation,

            int w, int h, Transform* tr);



    void updateGeometryTransform();



    uint32_t mLayerStack;

    int mOrientation;

    // user-provided visible area of the layer stack

services/surfaceflinger/LayerBase.cpp

+4 −1
Original line number Diff line number Diff line
@@ -306,8 +306,11 @@ void LayerBase::setPerFrameData(const sp<const DisplayDevice>& hw, 
    // we have to set the visible region on every frame because

    // we currently free it during onLayerDisplayed(), which is called

    // after HWComposer::commit() -- every frame.

    // Apply this display's projection's viewport to the visible region

    // before giving it to the HWC HAL.

    const Transform& tr = hw->getTransform();

    layer.setVisibleRegionScreen(tr.transform(visibleRegion));

    Region visible = tr.transform(visibleRegion.intersect(hw->getViewport()));

    layer.setVisibleRegionScreen(visible);

}



void LayerBase::setAcquireFence(const sp<const DisplayDevice>& hw,