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

Commit 47c494cc authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Android (Google) Code Review
Browse files

Merge "Remove sourceClip from OutputCompositionState"

parents 030090fa 06ca163d

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

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ public: 


    // Sets the projection state to use

    virtual void setProjection(const ui::Transform&, uint32_t orientation, const Rect& frame,

                               const Rect& viewport, const Rect& sourceClip,

                               const Rect& destinationClip, bool needsFiltering) = 0;

                               const Rect& viewport, const Rect& destinationClip,

                               bool needsFiltering) = 0;

    // Sets the bounds to use

    virtual void setBounds(const ui::Size&) = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public: 
    std::optional<DisplayId> getDisplayId() const override;

    void setCompositionEnabled(bool) override;

    void setProjection(const ui::Transform&, uint32_t orientation, const Rect& frame,

                       const Rect& viewport, const Rect& sourceClip, const Rect& destinationClip,

                       const Rect& viewport, const Rect& destinationClip,

                       bool needsFiltering) override;

    void setBounds(const ui::Size&) override;

    void setLayerStackFilter(uint32_t layerStackId, bool isInternal) override;

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

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ struct OutputCompositionState { 
    // The logical space user viewport rectangle

    Rect viewport;



    // The physical space source clip rectangle

    Rect sourceClip;



    // The physical space destination clip rectangle

    Rect destinationClip;

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

+2 −3
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ public: 
    MOCK_CONST_METHOD0(getDisplayId, std::optional<DisplayId>());



    MOCK_METHOD1(setCompositionEnabled, void(bool));

    MOCK_METHOD7(setProjection,

                 void(const ui::Transform&, uint32_t, const Rect&, const Rect&, const Rect&,

                      const Rect&, bool));

    MOCK_METHOD6(setProjection,

                 void(const ui::Transform&, uint32_t, const Rect&, const Rect&, const Rect&, bool));

    MOCK_METHOD1(setBounds, void(const ui::Size&));

    MOCK_METHOD2(setLayerStackFilter, void(uint32_t, bool));

services/surfaceflinger/CompositionEngine/src/Output.cpp

+2 −4
Original line number Diff line number Diff line
@@ -106,12 +106,10 @@ void Output::setCompositionEnabled(bool enabled) { 
}



void Output::setProjection(const ui::Transform& transform, uint32_t orientation, const Rect& frame,

                           const Rect& viewport, const Rect& sourceClip,

                           const Rect& destinationClip, bool needsFiltering) {

                           const Rect& viewport, const Rect& destinationClip, bool needsFiltering) {

    auto& outputState = editState();

    outputState.transform = transform;

    outputState.orientation = orientation;

    outputState.sourceClip = sourceClip;

    outputState.destinationClip = destinationClip;

    outputState.frame = frame;

    outputState.viewport = viewport;
@@ -863,7 +861,7 @@ std::optional<base::unique_fd> Output::composeSurfaces( 


    renderengine::DisplaySettings clientCompositionDisplay;

    clientCompositionDisplay.physicalDisplay = outputState.destinationClip;

    clientCompositionDisplay.clip = outputState.sourceClip;

    clientCompositionDisplay.clip = outputState.viewport;

    clientCompositionDisplay.orientation = outputState.orientation;

    clientCompositionDisplay.outputDataspace = mDisplayColorProfile->hasWideColorGamut()

            ? outputState.dataspace