diff options
| author | Conley Owens <cco3@android.com> | 2011-04-29 17:15:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 17:15:35 -0700 |
| commit | 08acaec6df66bd6a12b1e63016ed998abff4afdc (patch) | |
| tree | b137a05d546d369c8a5243ec8c70e1ce22789b5e | |
| parent | 737b5c58c9094e5759bd4162f23f73be2b71faaf (diff) | |
| parent | a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a (diff) | |
| download | frameworks_base-08acaec6df66bd6a12b1e63016ed998abff4afdc.zip frameworks_base-08acaec6df66bd6a12b1e63016ed998abff4afdc.tar.gz frameworks_base-08acaec6df66bd6a12b1e63016ed998abff4afdc.tar.bz2 | |
am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit 'a47c0d29bec7c242fb8d5ffe206c4c6ff85a178a':
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) |