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 | 7badf9c5e84655063155f5cf9b0011204cf38e8b (patch) | |
| tree | 89893129a55cf79038adfe36925ed61c6a36a08b /services/surfaceflinger | |
| parent | 68bf2355c743f676373bcb71f74c9c8ce21805dc (diff) | |
| parent | 88acc06a54158643d3a08d952ed231ffe8d8e906 (diff) | |
| download | frameworks_native-7badf9c5e84655063155f5cf9b0011204cf38e8b.zip frameworks_native-7badf9c5e84655063155f5cf9b0011204cf38e8b.tar.gz frameworks_native-7badf9c5e84655063155f5cf9b0011204cf38e8b.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
Diffstat (limited to 'services/surfaceflinger')
| -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) |