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

Commit a5b2029e authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix accidental activateTexture(0)"

parents 21f255de bd41ded5

libs/hwui/Texture.cpp

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ bool Texture::updateSize(uint32_t width, uint32_t height, GLint format) { 
void Texture::upload(GLint internalformat, uint32_t width, uint32_t height,

        GLenum format, GLenum type, const void* pixels) {

    GL_CHECKPOINT();

    mCaches.textureState().activateTexture(0);

    bool needsAlloc = updateSize(width, height, internalformat);

    if (!mId) {

        glGenTextures(1, &mId);

libs/hwui/renderstate/OffscreenBufferPool.cpp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ OffscreenBuffer::OffscreenBuffer(RenderState& renderState, Caches& caches, 
        , texture(caches) {

    uint32_t width = computeIdealDimension(viewportWidth);

    uint32_t height = computeIdealDimension(viewportHeight);

    caches.textureState().activateTexture(0);

    texture.resize(width, height, GL_RGBA);

    texture.blend = true;

    texture.setWrap(GL_CLAMP_TO_EDGE);