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

Commit 9c986b7f authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "<Insert something improper about OpenGL>"

parents 269be7dd ec31f83b

libs/hwui/Caches.cpp

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ void Caches::resetTexCoordsVertexPointer() { 
void Caches::enableTexCoordsVertexArray() {

    if (!mTexCoordsArrayEnabled) {

        glEnableVertexAttribArray(Program::kBindingTexCoords);

        mCurrentTexCoordsPointer = this;

        mTexCoordsArrayEnabled = true;

    }

}

libs/hwui/Rect.h

+8 −0
Original line number Diff line number Diff line
@@ -124,6 +124,14 @@ public: 
        return intersect(r.left, r.top, r.right, r.bottom);

    }



    bool contains(float l, float t, float r, float b) {

        return l >= left && t >= top && r <= right && b <= bottom;

    }



    bool contains(const Rect& r) {

        return contains(r.left, r.top, r.right, r.bottom);

    }



    bool unionWith(const Rect& r) {

        if (r.left < r.right && r.top < r.bottom) {

            if (left < right && top < bottom) {