diff options
| author | Conley Owens <cco3@android.com> | 2011-05-02 10:12:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-02 10:12:00 -0700 |
| commit | a31b3f2650dedf3cac596ed4763466ec605303e8 (patch) | |
| tree | dda820a8bb272033ac032b0f403529eed55e5ff3 | |
| parent | 981db85bf2a204f681c845f21332e5327f464a75 (diff) | |
| parent | 08acaec6df66bd6a12b1e63016ed998abff4afdc (diff) | |
| download | frameworks_base-a31b3f2650dedf3cac596ed4763466ec605303e8.zip frameworks_base-a31b3f2650dedf3cac596ed4763466ec605303e8.tar.gz frameworks_base-a31b3f2650dedf3cac596ed4763466ec605303e8.tar.bz2 | |
am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"
* commit '08acaec6df66bd6a12b1e63016ed998abff4afdc':
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) |