am 58e4a5e: Merge "Fixed to draw texture when loadTexture() is called at first time"

cco3 · Android Git Automerger · commit a47c0d29bec7 · 2011-04-29T10:24:16.000-07:00
* commit '58e4a5e2094c5003225fc715ee1a53b2461e71b1':
  Fixed to draw texture when loadTexture() is called at first time
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ status_t TextureManager::loadTexture(Texture* texture,`
`186`	`186`	`if (texture->name == -1UL) {`
`187`	`187`	`status_t err = initTexture(texture);`
`188`	`188`	`LOGE_IF(err, "loadTexture failed in initTexture (%s)", strerror(err));`
`189`		`- return err;`
	`189`	`+ if (err != NO_ERROR) return err;`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`if (texture->target != Texture::TEXTURE_2D)`