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

Commit b2201151 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev

parents 0b81adca 70735bd5

libs/hwui/Caches.cpp

+6 −2
Original line number Diff line number Diff line
@@ -551,9 +551,13 @@ void Caches::bindTexture(GLuint texture) { 
}



void Caches::bindTexture(GLenum target, GLuint texture) {

    if (mBoundTextures[mTextureUnit] != texture) {

    if (target == GL_TEXTURE_2D) {

        bindTexture(texture);

    } else {

        // GLConsumer directly calls glBindTexture() with

        // target=GL_TEXTURE_EXTERNAL_OES, don't cache this target

        // since the cached state could be stale

        glBindTexture(target, texture);

        mBoundTextures[mTextureUnit] = texture;

    }

}

libs/hwui/Caches.h

+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ private: 


    uint32_t mFunctorsCount;



    // Caches texture bindings for the GL_TEXTURE_2D target

    GLuint mBoundTextures[REQUIRED_TEXTURE_UNITS_COUNT];



    OverdrawColorSet mOverdrawDebugColorSet;