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

Commit b8d82b90 authored by Carlos Martinez Romero's avatar Carlos Martinez Romero Committed by Android (Google) Code Review
Browse files

Merge "Remove unused flag ro.sf.blurs_are_expensive and stale code."

parents 7affe03f e5d57ea6

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

+0 −3
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ struct CompositionRefreshArgs { 
    // Used to correctly apply an inverse-display buffer transform if applicable

    ui::Transform::RotationFlags internalDisplayRotationFlags{ui::Transform::ROT_0};



    // If true, GPU clocks will be increased when rendering blurs

    bool blursAreExpensive{false};



    // If true, the complete output geometry needs to be recomputed this frame

    bool updatingOutputGeometryThisFrame{false};

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

+3 −4
Original line number Diff line number Diff line
@@ -290,12 +290,11 @@ protected: 
    using GpuCompositionResult = compositionengine::impl::GpuCompositionResult;

    // Runs prepare frame in another thread while running client composition using

    // the previous frame's composition strategy.

    virtual GpuCompositionResult prepareFrameAsync(const CompositionRefreshArgs&) = 0;

    virtual GpuCompositionResult prepareFrameAsync() = 0;

    virtual void devOptRepaintFlash(const CompositionRefreshArgs&) = 0;

    virtual void finishFrame(const CompositionRefreshArgs&, GpuCompositionResult&&) = 0;

    virtual void finishFrame(GpuCompositionResult&&) = 0;

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

            const Region&, const compositionengine::CompositionRefreshArgs&,

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

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

    virtual void postFramebuffer() = 0;

    virtual void renderCachedSets(const CompositionRefreshArgs&) = 0;

    virtual bool chooseCompositionStrategy(

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 
    bool getSkipColorTransform() const override;

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

    void setExpensiveRenderingExpected(bool) override;

    void finishFrame(const CompositionRefreshArgs&, GpuCompositionResult&&) override;

    void finishFrame(GpuCompositionResult&&) override;



    // compositionengine::Display overrides

    DisplayId getId() const override;

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

+2 −3
Original line number Diff line number Diff line
@@ -96,11 +96,10 @@ public: 
    void updateColorProfile(const compositionengine::CompositionRefreshArgs&) override;

    void beginFrame() override;

    void prepareFrame() override;

    GpuCompositionResult prepareFrameAsync(const CompositionRefreshArgs&) override;

    GpuCompositionResult prepareFrameAsync() override;

    void devOptRepaintFlash(const CompositionRefreshArgs&) override;

    void finishFrame(const CompositionRefreshArgs&, GpuCompositionResult&&) override;

    void finishFrame(GpuCompositionResult&&) override;

    std::optional<base::unique_fd> composeSurfaces(const Region&,

                                                   const compositionengine::CompositionRefreshArgs&,

                                                   std::shared_ptr<renderengine::ExternalTexture>,

                                                   base::unique_fd&) override;

    void postFramebuffer() override;

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

+6 −8
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public: 
    MOCK_METHOD0(beginFrame, void());



    MOCK_METHOD0(prepareFrame, void());

    MOCK_METHOD1(prepareFrameAsync, GpuCompositionResult(const CompositionRefreshArgs&));

    MOCK_METHOD0(prepareFrameAsync, GpuCompositionResult());

    MOCK_METHOD1(chooseCompositionStrategy,

                 bool(std::optional<android::HWComposer::DeviceRequestedChanges>*));

    MOCK_METHOD1(chooseCompositionStrategyAsync,
@@ -110,14 +110,12 @@ public: 


    MOCK_METHOD1(devOptRepaintFlash, void(const compositionengine::CompositionRefreshArgs&));



    MOCK_METHOD2(finishFrame,

                 void(const compositionengine::CompositionRefreshArgs&, GpuCompositionResult&&));

    MOCK_METHOD1(finishFrame, void(GpuCompositionResult&&));



    MOCK_METHOD4(composeSurfaces,

                 std::optional<base::unique_fd>(

                         const Region&,

                         const compositionengine::CompositionRefreshArgs& refreshArgs,

                         std::shared_ptr<renderengine::ExternalTexture>, base::unique_fd&));

    MOCK_METHOD3(composeSurfaces,

                 std::optional<base::unique_fd>(const Region&,

                                                std::shared_ptr<renderengine::ExternalTexture>,

                                                base::unique_fd&));

    MOCK_CONST_METHOD0(getSkipColorTransform, bool());



    MOCK_METHOD0(postFramebuffer, void());