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

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

Merge "Small cleanup."

parents 2c94ba74 9bca4793

libs/hwui/Caches.cpp

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Caches::Caches(): Singleton<Caches>(), blend(false), lastSrcMode(GL_ZERO), 
    glBindBuffer(GL_ARRAY_BUFFER, meshBuffer);

    glBufferData(GL_ARRAY_BUFFER, sizeof(gMeshVertices), gMeshVertices, GL_STATIC_DRAW);



    currentBuffer = meshBuffer;

    mCurrentBuffer = meshBuffer;

}



/**
@@ -57,9 +57,9 @@ void Caches::bindMeshBuffer() { 
 * Binds the specified VBO.

 */

void Caches::bindMeshBuffer(const GLuint buffer) {

    if (currentBuffer != buffer) {

    if (mCurrentBuffer != buffer) {

        glBindBuffer(GL_ARRAY_BUFFER, buffer);

        currentBuffer = buffer;

        mCurrentBuffer = buffer;

    }

}
@@ -67,9 +67,9 @@ void Caches::bindMeshBuffer(const GLuint buffer) { 
 * Unbinds the VBO used to render simple textured quads.

 */

void Caches::unbindMeshBuffer() {

    if (currentBuffer) {

    if (mCurrentBuffer) {

        glBindBuffer(GL_ARRAY_BUFFER, 0);

        currentBuffer = 0;

        mCurrentBuffer = 0;

    }

}

libs/hwui/Caches.h

+3 −2
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ class Caches: public Singleton<Caches> { 


    friend class Singleton<Caches>;



    CacheLogger logger;

    CacheLogger mlogger;



    GLuint mCurrentBuffer;



public:

    void bindMeshBuffer();
@@ -92,7 +94,6 @@ public: 
    Program* currentProgram;



    GLuint meshBuffer;

    GLuint currentBuffer;



    TextureCache textureCache;

    LayerCache layerCache;

libs/hwui/Patch.cpp

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
namespace android {

namespace uirenderer {



class Caches;



///////////////////////////////////////////////////////////////////////////////

// Constructors/destructor

///////////////////////////////////////////////////////////////////////////////