commit | 06ecf3ddf1838be5ed29e372a77ed0c75c395c54 | [log] [tgz] |
---|---|---|
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 [diff] [blame] |
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>
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp index 0b6f22d..bc1b589 100644 --- a/src/libGLESv2/libGLESv2.cpp +++ b/src/libGLESv2/libGLESv2.cpp
@@ -1766,7 +1766,12 @@ } } - texture->generateMipmaps(); + gl::Error error = texture->generateMipmaps(); + if (error.isError()) + { + context->recordError(error); + return; + } } }