commit 526392dd96e59da3e59f7b547356e3c39da5be17
author Jamie Madill <jmadill@chromium.org> Fri Nov 16 09:35:14 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Fri Nov 16 15:47:52 2018 +0000
tree ed43ae42b1aeb08384012114949aa459745180e9
parent 417ac91cdb062fcadbeeeae2c0e1ba9bad426c3d

Use angle::Result in front-end (Part 9)

This removes the ANGLE_TRY_HANDLE macro. Also the internal uses of
gl::ErrorStreamBase. There are remaining uses in the validation code.

Further progress will be blocked on removing egl::Error and the use
of gl::Error in the validation layer.

Also reduces binary size by up to 4k.

Bug: angleproject:2491
Change-Id: I3e0481f99738f9f24256c10e73f3efcce9826a35
Reviewed-on: https://chromium-review.googlesource.com/c/1334427
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 1a092e2..3e7acb9 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -750,7 +750,7 @@
 
 void Context::tryGenPaths(GLsizei range, GLuint *createdOut)
 {
-    ANGLE_CONTEXT_TRY(mState.mPaths->createPaths(mImplementation.get(), range, createdOut));
+    ANGLE_CONTEXT_TRY(mState.mPaths->createPaths(this, range, createdOut));
 }
 
 GLuint Context::genPaths(GLsizei range)
@@ -3542,28 +3542,29 @@
     return angle::Result::Continue();
 }
 
-Error Context::prepareForClear(GLbitfield mask)
+angle::Result Context::prepareForClear(GLbitfield mask)
 {
     ANGLE_TRY(syncDirtyObjects(mClearDirtyObjects));
     ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureClearAttachmentsInitialized(this, mask));
     ANGLE_TRY(syncDirtyBits(mClearDirtyBits));
-    return NoError();
+    return angle::Result::Continue();
 }
 
-Error Context::prepareForClearBuffer(GLenum buffer, GLint drawbuffer)
+angle::Result Context::prepareForClearBuffer(GLenum buffer, GLint drawbuffer)
 {
     ANGLE_TRY(syncDirtyObjects(mClearDirtyObjects));
     ANGLE_TRY(mGLState.getDrawFramebuffer()->ensureClearBufferAttachmentsInitialized(this, buffer,
                                                                                      drawbuffer));
     ANGLE_TRY(syncDirtyBits(mClearDirtyBits));
-    return NoError();
+    return angle::Result::Continue();
 }
 
-Error Context::syncState(const State::DirtyBits &bitMask, const State::DirtyObjects &objectMask)
+angle::Result Context::syncState(const State::DirtyBits &bitMask,
+                                 const State::DirtyObjects &objectMask)
 {
     ANGLE_TRY(syncDirtyObjects(objectMask));
     ANGLE_TRY(syncDirtyBits(bitMask));
-    return NoError();
+    return angle::Result::Continue();
 }
 
 angle::Result Context::syncDirtyBits()
@@ -4545,29 +4546,29 @@
     // We do not currently support a non-trivial implementation of FlushMappedBufferRange
 }
 
-Error Context::syncStateForReadPixels()
+angle::Result Context::syncStateForReadPixels()
 {
     return syncState(mReadPixelsDirtyBits, mReadPixelsDirtyObjects);
 }
 
-Error Context::syncStateForTexImage()
+angle::Result Context::syncStateForTexImage()
 {
     return syncState(mTexImageDirtyBits, mTexImageDirtyObjects);
 }
 
-Error Context::syncStateForBlit()
+angle::Result Context::syncStateForBlit()
 {
     return syncState(mBlitDirtyBits, mBlitDirtyObjects);
 }
 
-Error Context::syncStateForPathOperation()
+angle::Result Context::syncStateForPathOperation()
 {
     ANGLE_TRY(syncDirtyObjects(mPathOperationDirtyObjects));
 
     // TODO(svaisanen@nvidia.com): maybe sync only state required for path rendering?
     ANGLE_TRY(syncDirtyBits());
 
-    return NoError();
+    return angle::Result::Continue();
 }
 
 void Context::activeShaderProgram(GLuint pipeline, GLuint program)
@@ -5343,7 +5344,7 @@
     return mZeroFilledBuffer.getInitialized(requstedSizeBytes, zeroBufferOut, 0);
 }
 
-Error Context::prepareForDispatch()
+angle::Result Context::prepareForDispatch()
 {
     ANGLE_TRY(syncDirtyObjects(mComputeDirtyObjects));