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

Commit 06ca163d authored by Marin Shalamanov's avatar Marin Shalamanov
Browse files

Remove sourceClip from OutputCompositionState 

Remove "sourceClip" since it has the same meaning as "viewport".

Bug: 161793589
Bug: 160404780
Test: m && flash device
Test: atest libsurfaceflinger_unittest libcompositionengine_test
Change-Id: I87e252ca4d6a81b41c9525beaa797d73390509da
parent 6db8d6e9

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

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




    // Sets the projection state to use

    // Sets the projection state to use

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

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

                               const Rect& viewport, const Rect& sourceClip,

                               const Rect& viewport, const Rect& destinationClip,

                               const Rect& destinationClip, bool needsFiltering) = 0;

                               bool needsFiltering) = 0;

    // Sets the bounds to use

    // Sets the bounds to use

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

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

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

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

    std::optional<DisplayId> getDisplayId() const override;

    void setCompositionEnabled(bool) override;

    void setCompositionEnabled(bool) override;

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

    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;

                       bool needsFiltering) override;

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

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

    void setLayerStackFilter(uint32_t layerStackId, bool isInternal) override;

    void setLayerStackFilter(uint32_t layerStackId, bool isInternal) override;

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

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

    // The logical space user viewport rectangle

    Rect viewport;

    Rect viewport;





    // The physical space source clip rectangle

    Rect sourceClip;



    // The physical space destination clip rectangle

    // The physical space destination clip rectangle

    Rect destinationClip;

    Rect destinationClip;

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

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

    MOCK_CONST_METHOD0(getDisplayId, std::optional<DisplayId>());





    MOCK_METHOD1(setCompositionEnabled, void(bool));

    MOCK_METHOD1(setCompositionEnabled, void(bool));

    MOCK_METHOD7(setProjection,

    MOCK_METHOD6(setProjection,

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

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

                      const Rect&, bool));

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

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

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

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

services/surfaceflinger/CompositionEngine/src/Output.cpp

+2 −4
Original line number Original line 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,

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

                           const Rect& viewport, const Rect& sourceClip,

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

                           const Rect& destinationClip, bool needsFiltering) {

    auto& outputState = editState();

    auto& outputState = editState();

    outputState.transform = transform;

    outputState.transform = transform;

    outputState.orientation = orientation;

    outputState.orientation = orientation;

    outputState.sourceClip = sourceClip;

    outputState.destinationClip = destinationClip;

    outputState.destinationClip = destinationClip;

    outputState.frame = frame;

    outputState.frame = frame;

    outputState.viewport = viewport;

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




    renderengine::DisplaySettings clientCompositionDisplay;

    renderengine::DisplaySettings clientCompositionDisplay;

    clientCompositionDisplay.physicalDisplay = outputState.destinationClip;

    clientCompositionDisplay.physicalDisplay = outputState.destinationClip;

    clientCompositionDisplay.clip = outputState.sourceClip;

    clientCompositionDisplay.clip = outputState.viewport;

    clientCompositionDisplay.orientation = outputState.orientation;

    clientCompositionDisplay.orientation = outputState.orientation;

    clientCompositionDisplay.outputDataspace = mDisplayColorProfile->hasWideColorGamut()

    clientCompositionDisplay.outputDataspace = mDisplayColorProfile->hasWideColorGamut()

            ? outputState.dataspace

            ? outputState.dataspace