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

Commit 7565da1f authored by Fred Fettinger's avatar Fred Fettinger Committed by Android Git Automerger
Browse files

am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE 

* commit 'b4093c12':
  hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
parents 3f0cf028 b4093c12

libs/hwui/Caches.cpp

+6 −2
Original line number Diff line number Diff line
@@ -534,9 +534,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
@@ -415,6 +415,7 @@ private: 


    uint32_t mFunctorsCount;



    // Caches texture bindings for the GL_TEXTURE_2D target

    GLuint mBoundTextures[REQUIRED_TEXTURE_UNITS_COUNT];



    OverdrawColorSet mOverdrawDebugColorSet;