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

Commit c1623d11 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

SF: Rename `postFramebuffer` for clarity 

The "post" in "postFramebuffer" can be read as a preposition or a verb,
making the name less easy to understand. Furthermore, "framebuffer" is
typically used in the context of GPU composition, but this function
involves DPU composition.

Rename to "presentFrameAndReleaseLayers" to better describe what it
does. While we're at it, shorten "presentAndGetFrameFences" to simply
"presentFrame".

Splitting out from original motivating discussion in
Ib9d074671e32c95875ef7e0791dd95d6e595e47a.

Bug: 241285491
Bug: 259132483
Test: No new behavior; no new tests
Change-Id: I41df1d0b98c34eaffe44c5c29006356964c555a6
parent 0659550f

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

+2 −2
Original line number Diff line number Diff line
@@ -298,14 +298,14 @@ protected: 
    virtual void finishFrame(GpuCompositionResult&&) = 0;

    virtual std::optional<base::unique_fd> composeSurfaces(

            const Region&, std::shared_ptr<renderengine::ExternalTexture>, base::unique_fd&) = 0;

    virtual void postFramebuffer() = 0;

    virtual void presentFrameAndReleaseLayers() = 0;

    virtual void renderCachedSets(const CompositionRefreshArgs&) = 0;

    virtual bool chooseCompositionStrategy(

            std::optional<android::HWComposer::DeviceRequestedChanges>*) = 0;

    virtual void applyCompositionStrategy(

            const std::optional<android::HWComposer::DeviceRequestedChanges>& changes) = 0;

    virtual bool getSkipColorTransform() const = 0;

    virtual FrameFences presentAndGetFrameFences() = 0;

    virtual FrameFences presentFrame() = 0;

    virtual std::vector<LayerFE::LayerSettings> generateClientCompositionRequests(

            bool supportsProtectedContent, ui::Dataspace outputDataspace,

            std::vector<LayerFE*> &outLayerRef) = 0;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public: 
            std::optional<android::HWComposer::DeviceRequestedChanges>*) override;

    void applyCompositionStrategy(const std::optional<DeviceRequestedChanges>&) override;

    bool getSkipColorTransform() const override;

    compositionengine::Output::FrameFences presentAndGetFrameFences() override;

    compositionengine::Output::FrameFences presentFrame() override;

    void setExpensiveRenderingExpected(bool) override;

    void finishFrame(GpuCompositionResult&&) override;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public: 
    std::optional<base::unique_fd> composeSurfaces(const Region&,

                                                   std::shared_ptr<renderengine::ExternalTexture>,

                                                   base::unique_fd&) override;

    void postFramebuffer() override;

    void presentFrameAndReleaseLayers() override;

    void renderCachedSets(const CompositionRefreshArgs&) override;

    void cacheClientCompositionRequests(uint32_t) override;

    bool canPredictCompositionStrategy(const CompositionRefreshArgs&) override;
@@ -133,7 +133,7 @@ protected: 
    };

    void applyCompositionStrategy(const std::optional<DeviceRequestedChanges>&) override{};

    bool getSkipColorTransform() const override;

    compositionengine::Output::FrameFences presentAndGetFrameFences() override;

    compositionengine::Output::FrameFences presentFrame() override;

    virtual renderengine::DisplaySettings generateClientCompositionDisplaySettings() const;

    std::vector<LayerFE::LayerSettings> generateClientCompositionRequests(

            bool supportsProtectedContent, ui::Dataspace outputDataspace,

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

+2 −2
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ public: 
                                                base::unique_fd&));

    MOCK_CONST_METHOD0(getSkipColorTransform, bool());



    MOCK_METHOD0(postFramebuffer, void());

    MOCK_METHOD0(presentFrameAndReleaseLayers, void());

    MOCK_METHOD1(renderCachedSets, void(const CompositionRefreshArgs&));

    MOCK_METHOD0(presentAndGetFrameFences, compositionengine::Output::FrameFences());

    MOCK_METHOD0(presentFrame, compositionengine::Output::FrameFences());



    MOCK_METHOD3(generateClientCompositionRequests,

                 std::vector<LayerFE::LayerSettings>(bool, ui::Dataspace, std::vector<compositionengine::LayerFE*>&));

services/surfaceflinger/CompositionEngine/src/Display.cpp

+2 −2
Original line number Diff line number Diff line
@@ -362,8 +362,8 @@ void Display::applyClientTargetRequests(const ClientTargetProperty& clientTarget 
            static_cast<ui::PixelFormat>(clientTargetProperty.clientTargetProperty.pixelFormat));

}



compositionengine::Output::FrameFences Display::presentAndGetFrameFences() {

    auto fences = impl::Output::presentAndGetFrameFences();

compositionengine::Output::FrameFences Display::presentFrame() {

    auto fences = impl::Output::presentFrame();



    const auto halDisplayIdOpt = HalDisplayId::tryCast(mId);

    if (mIsDisconnected || !halDisplayIdOpt) {