commit f7100b981f0856b238252e6052509eecf8e5aded
author Geoff Lang <geofflang@chromium.org> Mon Sep 08 16:17:08 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Fri Sep 19 14:01:45 2014 +0000
tree f944e3009f2f9b5ba8d06dd717d52be9fce929f4
parent d5a796caeedbc1e6c8d483019f1da0cb676e118a

Updated the vertex buffer classes to use Error objects.

BUG=angle:520

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

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 87480c4..c467fa8 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1683,10 +1683,10 @@
     applyRenderTarget(mode, false);
     applyState(mode);
 
-    GLenum err = mRenderer->applyVertexBuffer(programBinary, mState.getVertexArray()->getVertexAttributes(), mState.getVertexAttribCurrentValues(), first, count, instances);
-    if (err != GL_NO_ERROR)
+    Error error = mRenderer->applyVertexBuffer(programBinary, mState.getVertexArray()->getVertexAttributes(), mState.getVertexAttribCurrentValues(), first, count, instances);
+    if (error.isError())
     {
-        return gl::error(err);
+        return gl::error(error.getCode());
     }
 
     bool transformFeedbackActive = applyTransformFeedbackBuffers();
@@ -1740,12 +1740,12 @@
     }
 
     GLsizei vertexCount = indexInfo.indexRange.length() + 1;
-    GLenum err = mRenderer->applyVertexBuffer(programBinary, vao->getVertexAttributes(),
-                                              mState.getVertexAttribCurrentValues(),
-                                              indexInfo.indexRange.start, vertexCount, instances);
-    if (err != GL_NO_ERROR)
+    error = mRenderer->applyVertexBuffer(programBinary, vao->getVertexAttributes(),
+                                         mState.getVertexAttribCurrentValues(),
+                                         indexInfo.indexRange.start, vertexCount, instances);
+    if (error.isError())
     {
-        return gl::error(err);
+        return gl::error(error.getCode());
     }
 
     bool transformFeedbackActive = applyTransformFeedbackBuffers();