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

Commit 8fa4c811 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix[2798925] Gingerbread TOT not booting 

Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.

Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
parent 781953d6

libs/surfaceflinger/TextureManager.cpp

+3 −6
Original line number Diff line number Diff line
@@ -297,22 +297,19 @@ status_t TextureManager::loadTexture(Texture* texture, 
void TextureManager::activateTexture(const Texture& texture, bool filter)

{

    const GLenum target = getTextureTarget(&texture);

    if (target == Texture::TEXTURE_2D) {

    if (target == GL_TEXTURE_2D) {

        glBindTexture(GL_TEXTURE_2D, texture.name);

        glEnable(GL_TEXTURE_2D);

#if defined(GL_OES_texture_external)

        if (GLExtensions::getInstance().haveTextureExternal()) {

            glDisable(GL_TEXTURE_EXTERNAL_OES);

        }

#endif

    }

#if defined(GL_OES_texture_external)

    else {

    } else {

        glBindTexture(GL_TEXTURE_EXTERNAL_OES, texture.name);

        glEnable(GL_TEXTURE_EXTERNAL_OES);

        glDisable(GL_TEXTURE_2D);

    }

#endif

    }



    if (filter) {

        glTexParameterx(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);