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

Commit 6cf6ba69 authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Remove unused HWCLayer::setPerFrameDefaultState()"

parents c4fd05b1 51d22007

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -800,9 +800,6 @@ public: 
    virtual void setAcquireFenceFd(int fenceFd) {

    virtual void setAcquireFenceFd(int fenceFd) {

        getLayer()->acquireFenceFd = fenceFd;

        getLayer()->acquireFenceFd = fenceFd;

    }

    }

    virtual void setPerFrameDefaultState() {

        //getLayer()->compositionType = HWC_FRAMEBUFFER;

    }

    virtual void setDefaultState() {

    virtual void setDefaultState() {

        getLayer()->compositionType = HWC_FRAMEBUFFER;

        getLayer()->compositionType = HWC_FRAMEBUFFER;

        getLayer()->hints = 0;

        getLayer()->hints = 0;

services/surfaceflinger/DisplayHardware/HWComposer.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -143,7 +143,6 @@ public: 
        virtual int32_t getCompositionType() const = 0;

        virtual int32_t getCompositionType() const = 0;

        virtual uint32_t getHints() const = 0;

        virtual uint32_t getHints() const = 0;

        virtual int getAndResetReleaseFenceFd() = 0;

        virtual int getAndResetReleaseFenceFd() = 0;

        virtual void setPerFrameDefaultState() = 0;

        virtual void setDefaultState() = 0;

        virtual void setDefaultState() = 0;

        virtual void setSkip(bool skip) = 0;

        virtual void setSkip(bool skip) = 0;

        virtual void setBlending(uint32_t blending) = 0;

        virtual void setBlending(uint32_t blending) = 0;

services/surfaceflinger/LayerBase.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -300,7 +300,6 @@ void LayerBase::setGeometry( 




void LayerBase::setPerFrameData(const sp<const DisplayDevice>& hw,

void LayerBase::setPerFrameData(const sp<const DisplayDevice>& hw,

        HWComposer::HWCLayerInterface& layer) {

        HWComposer::HWCLayerInterface& layer) {

    layer.setPerFrameDefaultState();

    // we have to set the visible region on every frame because

    // we have to set the visible region on every frame because

    // we currently free it during onLayerDisplayed(), which is called

    // we currently free it during onLayerDisplayed(), which is called

    // after HWComposer::commit() -- every frame.

    // after HWComposer::commit() -- every frame.