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

Commit 99a164e6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delete unused clip parameter in clearWithOpenGL"

parents 7c978712 1748719e

services/surfaceflinger/Layer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ void Layer::onDraw(const sp<const DisplayDevice>& hw, const Region& clip, 
        // if not everything below us is covered, we plug the holes!

        Region holes(clip.subtract(under));

        if (!holes.isEmpty()) {

            clearWithOpenGL(hw, holes, 0, 0, 0, 1);

            clearWithOpenGL(hw, 0, 0, 0, 1);

        }

        return;

    }
@@ -978,7 +978,7 @@ void Layer::onDraw(const sp<const DisplayDevice>& hw, const Region& clip, 




void Layer::clearWithOpenGL(const sp<const DisplayDevice>& hw,

        const Region& /* clip */, float red, float green, float blue,

        float red, float green, float blue,

        float alpha) const

{

    RenderEngine& engine(mFlinger->getRenderEngine());
@@ -988,8 +988,8 @@ void Layer::clearWithOpenGL(const sp<const DisplayDevice>& hw, 
}



void Layer::clearWithOpenGL(

        const sp<const DisplayDevice>& hw, const Region& clip) const {

    clearWithOpenGL(hw, clip, 0,0,0,0);

        const sp<const DisplayDevice>& hw) const {

    clearWithOpenGL(hw, 0,0,0,0);

}



void Layer::drawWithOpenGL(const sp<const DisplayDevice>& hw,

services/surfaceflinger/Layer.h

+2 −2
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ public: 
#endif

    // -----------------------------------------------------------------------



    void clearWithOpenGL(const sp<const DisplayDevice>& hw, const Region& clip) const;

    void clearWithOpenGL(const sp<const DisplayDevice>& hw) const;

    void setFiltering(bool filtering);

    bool getFiltering() const;
@@ -459,7 +459,7 @@ private: 
    static bool getOpacityForFormat(uint32_t format);



    // drawing

    void clearWithOpenGL(const sp<const DisplayDevice>& hw, const Region& clip,

    void clearWithOpenGL(const sp<const DisplayDevice>& hw,

            float r, float g, float b, float alpha) const;

    void drawWithOpenGL(const sp<const DisplayDevice>& hw, const Region& clip,

            bool useIdentityTransform) const;

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ bool SurfaceFlinger::doComposeSurfaces( 
                                && hasClientComposition) {

                            // never clear the very first layer since we're

                            // guaranteed the FB is already cleared

                            layer->clearWithOpenGL(displayDevice, clip);

                            layer->clearWithOpenGL(displayDevice);

                        }

                        break;

                    }

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2143,7 +2143,7 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const 
                                && hasGlesComposition) {

                            // never clear the very first layer since we're

                            // guaranteed the FB is already cleared

                            layer->clearWithOpenGL(hw, clip);

                            layer->clearWithOpenGL(hw);

                        }

                        break;

                    }