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

Commit 2565c5b6 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am b2c315eb: am 6a73368b: Merge "fix a typo that prevented glTexImage2D... 

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

Merge commit 'b2c315eb'

* commit 'b2c315eb':
  fix a typo that prevented glTexImage2D codepath to work
parents fb5d9e7c b2c315eb

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);