commit 675fe718fa75876712d6d41030ed6efd9b3e238c
author Jamie Madill <jmadill@chromium.org> Mon Dec 19 13:07:54 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Dec 19 19:27:17 2016 +0000
tree 4e6e5f70cb20c0a1f01242b70a63ce0029b22473
parent 77ba408ab2a0f94cd2a29ae7ee939db3bdcf172b

Don't return Error from Context draw methods.

The Error should be consumed in the Context call.

BUG=angleproject:747

Change-Id: I5daae602e8f6c7feed89573c6c9387c295ba9a32
Reviewed-on: https://chromium-review.googlesource.com/421258
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index c6bc799..cd248fb 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -1618,56 +1618,61 @@
     }
 }
 
-Error Context::drawArrays(GLenum mode, GLint first, GLsizei count)
+void Context::drawArrays(GLenum mode, GLint first, GLsizei count)
 {
     syncRendererState();
-    ANGLE_TRY(mImplementation->drawArrays(mode, first, count));
-    MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
-
-    return NoError();
+    auto error = mImplementation->drawArrays(mode, first, count);
+    handleError(error);
+    if (!error.isError())
+    {
+        MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
+    }
 }
 
-Error Context::drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)
+void Context::drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)
 {
     syncRendererState();
-    ANGLE_TRY(mImplementation->drawArraysInstanced(mode, first, count, instanceCount));
-    MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
-
-    return NoError();
+    auto error = mImplementation->drawArraysInstanced(mode, first, count, instanceCount);
+    handleError(error);
+    if (!error.isError())
+    {
+        MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
+    }
 }
 
-Error Context::drawElements(GLenum mode,
-                            GLsizei count,
-                            GLenum type,
-                            const GLvoid *indices,
-                            const IndexRange &indexRange)
+void Context::drawElements(GLenum mode,
+                           GLsizei count,
+                           GLenum type,
+                           const GLvoid *indices,
+                           const IndexRange &indexRange)
 {
     syncRendererState();
-    return mImplementation->drawElements(mode, count, type, indices, indexRange);
+    handleError(mImplementation->drawElements(mode, count, type, indices, indexRange));
 }
 
-Error Context::drawElementsInstanced(GLenum mode,
-                                     GLsizei count,
-                                     GLenum type,
-                                     const GLvoid *indices,
-                                     GLsizei instances,
-                                     const IndexRange &indexRange)
+void Context::drawElementsInstanced(GLenum mode,
+                                    GLsizei count,
+                                    GLenum type,
+                                    const GLvoid *indices,
+                                    GLsizei instances,
+                                    const IndexRange &indexRange)
 {
     syncRendererState();
-    return mImplementation->drawElementsInstanced(mode, count, type, indices, instances,
-                                                  indexRange);
+    handleError(
+        mImplementation->drawElementsInstanced(mode, count, type, indices, instances, indexRange));
 }
 
-Error Context::drawRangeElements(GLenum mode,
-                                 GLuint start,
-                                 GLuint end,
-                                 GLsizei count,
-                                 GLenum type,
-                                 const GLvoid *indices,
-                                 const IndexRange &indexRange)
+void Context::drawRangeElements(GLenum mode,
+                                GLuint start,
+                                GLuint end,
+                                GLsizei count,
+                                GLenum type,
+                                const GLvoid *indices,
+                                const IndexRange &indexRange)
 {
     syncRendererState();
-    return mImplementation->drawRangeElements(mode, start, end, count, type, indices, indexRange);
+    handleError(
+        mImplementation->drawRangeElements(mode, start, end, count, type, indices, indexRange));
 }
 
 void Context::drawArraysIndirect(GLenum mode, const GLvoid *indirect)
@@ -1682,14 +1687,14 @@
     handleError(mImplementation->drawElementsIndirect(mode, type, indirect));
 }
 
-Error Context::flush()
+void Context::flush()
 {
-    return mImplementation->flush();
+    handleError(mImplementation->flush());
 }
 
-Error Context::finish()
+void Context::finish()
 {
-    return mImplementation->finish();
+    handleError(mImplementation->finish());
 }
 
 void Context::insertEventMarker(GLsizei length, const char *marker)