diff options
| author | Conley Owens <cco3@android.com> | 2011-04-29 10:24:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 10:24:16 -0700 |
| commit | a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a (patch) | |
| tree | 4020aa8ab7b6c12936deb2b280a46a930106adb4 | |
| parent | 520dd927cbe02ae52add1f90e282750582a9e95e (diff) | |
| parent | 58e4a5e2094c5003225fc715ee1a53b2461e71b1 (diff) | |
| download | frameworks_base-a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a.zip frameworks_base-a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a.tar.gz frameworks_base-a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a.tar.bz2 | |
am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit '58e4a5e2094c5003225fc715ee1a53b2461e71b1':
Fixed to draw texture when loadTexture() is called at first time
| -rw-r--r-- | services/surfaceflinger/TextureManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/TextureManager.cpp b/services/surfaceflinger/TextureManager.cpp index c9a15f5..9e24f90 100644 --- a/services/surfaceflinger/TextureManager.cpp +++ b/services/surfaceflinger/TextureManager.cpp @@ -186,7 +186,7 @@ status_t TextureManager::loadTexture(Texture* texture, if (texture->name == -1UL) { status_t err = initTexture(texture); LOGE_IF(err, "loadTexture failed in initTexture (%s)", strerror(err)); - return err; + if (err != NO_ERROR) return err; } if (texture->target != Texture::TEXTURE_2D) |