commit b6664925cb8a35fec11efebb437b3e8706e26e43
author Jamie Madill <jmadill@chromium.org> Tue Jul 25 12:55:04 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Jul 26 16:23:25 2017 +0000
tree 0d124b06b81068ee4c88565acedd88ca8b3811e2
parent 14a26aeaf443f4ec7e9d104e3d5dc4cdc8be8fd3

Add error handling macro to Context.

This is a small specialized macro to remove all the redundant
handleError calls and return value checking.

Also add a Context::prepareForDraw member that will be used in
follow-up patches to do necessary work prior to a draw call.

BUG=angleproject:2107
BUG=angleproject:2116

Change-Id: I8a32d2206c218fcca5236abfd3f2ce370296ca99
Reviewed-on: https://chromium-review.googlesource.com/585288
Reviewed-by: Geoff Lang <geofflang@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 fab6553..98efef9 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -45,6 +45,11 @@
 namespace
 {
 
+#define ANGLE_HANDLE_ERR(X) \
+    handleError(X);         \
+    return;
+#define ANGLE_CONTEXT_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_HANDLE_ERR);
+
 template <typename T>
 std::vector<gl::Path *> GatherPaths(gl::PathManager &resourceManager,
                                     GLsizei numPaths,
@@ -1832,30 +1837,23 @@
 
 void Context::drawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    syncRendererState();
-    auto error = mImplementation->drawArrays(this, mode, first, count);
-    handleError(error);
-    if (!error.isError())
-    {
-        MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
-    }
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(mImplementation->drawArrays(this, mode, first, count));
+    MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
 }
 
 void Context::drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)
 {
-    syncRendererState();
-    auto error = mImplementation->drawArraysInstanced(this, mode, first, count, instanceCount);
-    handleError(error);
-    if (!error.isError())
-    {
-        MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
-    }
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(
+        mImplementation->drawArraysInstanced(this, mode, first, count, instanceCount));
+    MarkTransformFeedbackBufferUsage(mGLState.getCurrentTransformFeedback());
 }
 
 void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
 {
-    syncRendererState();
-    handleError(mImplementation->drawElements(this, mode, count, type, indices));
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(mImplementation->drawElements(this, mode, count, type, indices));
 }
 
 void Context::drawElementsInstanced(GLenum mode,
@@ -1864,8 +1862,8 @@
                                     const void *indices,
                                     GLsizei instances)
 {
-    syncRendererState();
-    handleError(
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(
         mImplementation->drawElementsInstanced(this, mode, count, type, indices, instances));
 }
 
@@ -1876,20 +1874,21 @@
                                 GLenum type,
                                 const void *indices)
 {
-    syncRendererState();
-    handleError(mImplementation->drawRangeElements(this, mode, start, end, count, type, indices));
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(
+        mImplementation->drawRangeElements(this, mode, start, end, count, type, indices));
 }
 
 void Context::drawArraysIndirect(GLenum mode, const void *indirect)
 {
-    syncRendererState();
-    handleError(mImplementation->drawArraysIndirect(this, mode, indirect));
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(mImplementation->drawArraysIndirect(this, mode, indirect));
 }
 
 void Context::drawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
 {
-    syncRendererState();
-    handleError(mImplementation->drawElementsIndirect(this, mode, type, indirect));
+    ANGLE_CONTEXT_TRY(prepareForDraw());
+    ANGLE_CONTEXT_TRY(mImplementation->drawElementsIndirect(this, mode, type, indirect));
 }
 
 void Context::flush()
@@ -2821,6 +2820,12 @@
     mWorkarounds.loseContextOnOutOfMemory = (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT);
 }
 
+Error Context::prepareForDraw()
+{
+    syncRendererState();
+    return NoError();
+}
+
 void Context::syncRendererState()
 {
     const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
@@ -2915,11 +2920,11 @@
 
     syncStateForReadPixels();
 
-    Framebuffer *framebufferObject = mGLState.getReadFramebuffer();
-    ASSERT(framebufferObject);
+    Framebuffer *readFBO = mGLState.getReadFramebuffer();
+    ASSERT(readFBO);
 
     Rectangle area(x, y, width, height);
-    handleError(framebufferObject->readPixels(this, area, format, type, pixels));
+    handleError(readFBO->readPixels(this, area, format, type, pixels));
 }
 
 void Context::copyTexImage2D(GLenum target,
@@ -4645,7 +4650,6 @@
     Program *programObject = getProgram(program);
     ASSERT(programObject);
     handleError(programObject->link(this));
-    mGLState.onProgramExecutableChange(programObject);
 }
 
 void Context::releaseShaderCompiler()
@@ -4840,8 +4844,8 @@
 {
     Program *programObject = getProgram(program);
     ASSERT(programObject != nullptr);
+
     handleError(programObject->loadBinary(this, binaryFormat, binary, length));
-    mGLState.onProgramExecutableChange(programObject);
 }
 
 }  // namespace gl