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

Commit dee4546b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12632686 from e23f11cc to 25Q1-release 

Change-Id: I9b8a53d6b83c9f22420a95106a6126e1c7f1bc58
parents ea330cac e23f11cc

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFE.h

+0 −3
Original line number Diff line number Diff line
@@ -148,9 +148,6 @@ public: 
    virtual std::optional<LayerSettings> prepareClientComposition(

            ClientCompositionTargetSettings&) const = 0;



    // Called after the layer is displayed to update the presentation fence

    virtual void onLayerDisplayed(ftl::SharedFuture<FenceResult>, ui::LayerStack layerStack) = 0;



    // Initializes a promise for a buffer release fence and provides the future for that

    // fence. This should only be called when a promise has not yet been created, or

    // after the previous promise has already been fulfilled. Attempting to call this

services/surfaceflinger/CompositionEngine/include/compositionengine/mock/LayerFE.h

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ public: 
                       std::optional<compositionengine::LayerFE::LayerSettings>(

                               compositionengine::LayerFE::ClientCompositionTargetSettings&));



    MOCK_METHOD(void, onLayerDisplayed, (ftl::SharedFuture<FenceResult>, ui::LayerStack),

                (override));



    MOCK_METHOD0(createReleaseFenceFuture, ftl::Future<FenceResult>());

    MOCK_METHOD1(setReleaseFence, void(const FenceResult&));

    MOCK_METHOD0(getReleaseFencePromiseStatus, LayerFE::ReleaseFencePromiseStatus());

services/surfaceflinger/LayerFE.cpp

+0 −6
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "LayerFE.h"

#include "SurfaceFlinger.h"

#include "ui/FenceResult.h"

#include "ui/LayerStack.h"



namespace android {
@@ -343,11 +342,6 @@ void LayerFE::prepareShadowClientComposition(LayerFE::LayerSettings& caster, 
    caster.shadow = state;

}



void LayerFE::onLayerDisplayed(ftl::SharedFuture<FenceResult> futureFenceResult,

                               ui::LayerStack layerStack) {

    mCompositionResult.releaseFences.emplace_back(std::move(futureFenceResult), layerStack);

}



CompositionResult&& LayerFE::stealCompositionResult() {

    return std::move(mCompositionResult);

}

services/surfaceflinger/LayerFE.h

+0 −3
Original line number Diff line number Diff line
@@ -22,14 +22,12 @@ 
#include "compositionengine/LayerFE.h"

#include "compositionengine/LayerFECompositionState.h"

#include "renderengine/LayerSettings.h"

#include "ui/LayerStack.h"



#include <ftl/future.h>



namespace android {



struct CompositionResult {

    std::vector<std::pair<ftl::SharedFuture<FenceResult>, ui::LayerStack>> releaseFences;

    sp<Fence> lastClientCompositionFence = nullptr;

};
@@ -41,7 +39,6 @@ public: 
    // compositionengine::LayerFE overrides

    const compositionengine::LayerFECompositionState* getCompositionState() const override;

    bool onPreComposition(bool updatingOutputGeometryThisFrame) override;

    void onLayerDisplayed(ftl::SharedFuture<FenceResult>, ui::LayerStack) override;

    const char* getDebugName() const override;

    int32_t getSequence() const override;

    bool hasRoundedCorners() const override;