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

Commit 17c6d808 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "Optimize mirror layer management" into sc-dev am: a1f13f4c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15180135

Change-Id: I07c19be8d398966b38fd880e9dcf07a57be81e6a
parents af047f7a a1f13f4c

services/surfaceflinger/Layer.cpp

+9 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ Layer::~Layer() { 
    if (mDrawingState.sidebandStream != nullptr) {

        mFlinger->mTunnelModeEnabledReporter->decrementTunnelModeCount();

    }

    if (mHadClonedChild) {

        mFlinger->mNumClones--;

    }

}



LayerCreationArgs::LayerCreationArgs(SurfaceFlinger* flinger, sp<Client> client, std::string name,
@@ -2536,6 +2539,12 @@ bool Layer::getPrimaryDisplayOnly() const { 
    return parent == nullptr ? false : parent->getPrimaryDisplayOnly();

}



void Layer::setClonedChild(const sp<Layer>& clonedChild) {

    mClonedChild = clonedChild;

    mHadClonedChild = true;

    mFlinger->mNumClones++;

}



// ---------------------------------------------------------------------------



std::ostream& operator<<(std::ostream& stream, const Layer::FrameRate& rate) {

services/surfaceflinger/Layer.h

+2 −0
Original line number Diff line number Diff line
@@ -863,6 +863,8 @@ public: 
    // The layers in the cloned hierarchy will match the lifetime of the real layers. That is

    // if the real layer is destroyed, then the clone layer will also be destroyed.

    sp<Layer> mClonedChild;

    bool mHadClonedChild = false;

    void setClonedChild(const sp<Layer>& mClonedChild);



    mutable bool contentDirty{false};

    Region surfaceDamageRegion;

services/surfaceflinger/SurfaceFlinger.cpp

+7 −3
Original line number Diff line number Diff line
@@ -3242,8 +3242,10 @@ void SurfaceFlinger::commitTransactionLocked() { 
    }



    commitOffscreenLayers();

    if (mNumClones > 0) {

        mDrawingState.traverse([&](Layer* layer) { layer->updateMirrorInfo(); });

    }

}



void SurfaceFlinger::commitOffscreenLayers() {

    for (Layer* offscreenLayer : mOffscreenLayers) {
@@ -3348,7 +3350,9 @@ bool SurfaceFlinger::handlePageFlip() { 
        mBootStage = BootStage::BOOTANIMATION;

    }



    if (mNumClones > 0) {

        mDrawingState.traverse([&](Layer* layer) { layer->updateCloneBufferInfo(); });

    }



    // Only continue with the refresh if there is actually new work to do

    return !mLayersWithQueuedFrames.empty() && newDataLatched;
@@ -4239,7 +4243,7 @@ status_t SurfaceFlinger::mirrorLayer(const sp<Client>& client, const sp<IBinder> 
            return result;

        }



        mirrorLayer->mClonedChild = mirrorFrom->createClone();

        mirrorLayer->setClonedChild(mirrorFrom->createClone());

    }



    *outLayerId = mirrorLayer->sequence;

services/surfaceflinger/SurfaceFlinger.h

+3 −0
Original line number Diff line number Diff line
@@ -316,6 +316,9 @@ public: 
    void removeHierarchyFromOffscreenLayers(Layer* layer);

    void removeFromOffscreenLayers(Layer* layer);



    // TODO: Remove atomic if move dtor to main thread CL lands

    std::atomic<uint32_t> mNumClones;



    TransactionCallbackInvoker& getTransactionCallbackInvoker() {

        return mTransactionCallbackInvoker;

    }