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

Commit 3c7a766c authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 6a73368b: Merge "fix a typo that prevented glTexImage2D codepath to work" into gingerbread 

Merge commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89' into gingerbread-plus-aosp

* commit '6a73368be44f45a80cc4b65dc57b9ff529cb2d89':
  fix a typo that prevented glTexImage2D codepath to work
parents 83f7036f 998831fb

services/surfaceflinger/TextureManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ status_t TextureManager::loadTexture(Texture* texture, 
        return err;

    }



    if (texture->target != GL_TEXTURE_2D)

    if (texture->target != Texture::TEXTURE_2D)

        return INVALID_OPERATION;



    glBindTexture(GL_TEXTURE_2D, texture->name);