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

Commit eb5c1376 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Lut screenshot] backend implementation v2" into main

parents 9bf3e87d 10fc8990

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public: 
    createLayerFECompositionState() = 0;



    virtual HWComposer& getHwComposer() const = 0;

    virtual void setHwComposer(std::unique_ptr<HWComposer>) = 0;

    virtual void setHwComposer(HWComposer*) = 0;



    virtual renderengine::RenderEngine& getRenderEngine() const = 0;

    virtual void setRenderEngine(renderengine::RenderEngine*) = 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ public: 


        // Currently latched frame number, 0 if invalid.

        uint64_t frameNumber = 0;



        // layer serial number, -1 if invalid.

        int32_t sequence = -1;

    };



    // Describes the states of the release fence. Checking the states allows checks

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

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public: 
            override;



    HWComposer& getHwComposer() const override;

    void setHwComposer(std::unique_ptr<HWComposer>) override;

    void setHwComposer(HWComposer*) override;



    renderengine::RenderEngine& getRenderEngine() const override;

    void setRenderEngine(renderengine::RenderEngine*) override;
@@ -59,7 +59,7 @@ public: 
    void setNeedsAnotherUpdateForTest(bool);



private:

    std::unique_ptr<HWComposer> mHwComposer;

    HWComposer* mHwComposer;

    renderengine::RenderEngine* mRenderEngine;

    std::shared_ptr<TimeStats> mTimeStats;

    bool mNeedsAnotherUpdate = false;

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public: 
                 std::unique_ptr<compositionengine::LayerFECompositionState>());



    MOCK_CONST_METHOD0(getHwComposer, HWComposer&());

    MOCK_METHOD1(setHwComposer, void(std::unique_ptr<HWComposer>));

    MOCK_METHOD1(setHwComposer, void(HWComposer*));



    MOCK_CONST_METHOD0(getRenderEngine, renderengine::RenderEngine&());

    MOCK_METHOD1(setRenderEngine, void(renderengine::RenderEngine*));

services/surfaceflinger/CompositionEngine/src/CompositionEngine.cpp

+3 −3
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ CompositionEngine::createLayerFECompositionState() { 
}



HWComposer& CompositionEngine::getHwComposer() const {

    return *mHwComposer.get();

    return *mHwComposer;

}



void CompositionEngine::setHwComposer(std::unique_ptr<HWComposer> hwComposer) {

    mHwComposer = std::move(hwComposer);

void CompositionEngine::setHwComposer(HWComposer* hwComposer) {

    mHwComposer = hwComposer;

}



renderengine::RenderEngine& CompositionEngine::getRenderEngine() const {