commit 06ecf3ddf1838be5ed29e372a77ed0c75c395c54
author Geoff Lang <geofflang@chromium.org> Tue Sep 23 16:39:50 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Wed Oct 29 14:55:09 2014 +0000
tree 6189e2de04ffe00997c527d83e6ebf5f51db9412
parent 2a517272f07df229fb5f016ae81046f4fd9c9400

Updated mipmap generation to return Error objects.

BUG=angle:520

Change-Id: Ic4e57148d031d6c452b3054efad98f6e730c7691
Reviewed-on: https://chromium-review.googlesource.com/221394
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 08b07c8..cd4fc4e 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -131,9 +131,9 @@
     return image->getActualFormat();
 }
 
-void Texture::generateMipmaps()
+Error Texture::generateMipmaps()
 {
-    getImplementation()->generateMipmaps();
+    return getImplementation()->generateMipmaps();
 }
 
 Error Texture::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
@@ -361,11 +361,11 @@
     return GetInternalFormatInfo(getInternalFormat(level)).depthBits > 0;
 }
 
-void Texture2D::generateMipmaps()
+Error Texture2D::generateMipmaps()
 {
     releaseTexImage();
 
-    mTexture->generateMipmaps();
+    return mTexture->generateMipmaps();
 }
 
 // Tests for 2D texture (mipmap) completeness. [OpenGL ES 2.0.24] section 3.7.10 page 81.