Buffer: Minor error macro cleanups.

Refactoring patch only. BUG=angleproject:1635 Change-Id: I9b86fc77f8f62a0f67f9fc73debdc8fb5e379bcc Reviewed-on: https://chromium-review.googlesource.com/450918Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Buffer: Minor error macro cleanups.
ef964d48 · Jamie Madill · Commit Bot · 05356e35 · ef964d48
Commit ef964d48 authored Mar 06, 2017 by Jamie Madill Committed by Commit Bot Mar 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 22 deletions

Buffer.cpp src/libANGLE/Buffer.cpp +10 -22

No files found.
--- a/src/libANGLE/Buffer.cpp
+++ b/src/libANGLE/Buffer.cpp
@@ -107,12 +107,8 @@ Error Buffer::map(const Context *context, GLenum access)
 {
    ASSERT(!mState.mMapped);
-    Error error = mImpl->map(rx::SafeGetImpl(context), access, &mState.mMapPointer);
+    mState.mMapPointer = nullptr;
-    if (error.isError())
+    ANGLE_TRY(mImpl->map(rx::SafeGetImpl(context), access, &mState.mMapPointer));
-    {
-        mState.mMapPointer = nullptr;
-        return error;
-    }
    ASSERT(access == GL_WRITE_ONLY_OES);
@@ -123,7 +119,7 @@ Error Buffer::map(const Context *context, GLenum access)
    mState.mAccessFlags = GL_MAP_WRITE_BIT;
    mIndexRangeCache.clear();
-    return error;
+    return NoError();
 }
 Error Buffer::mapRange(const Context *context,
@@ -134,13 +130,9 @@ Error Buffer::mapRange(const Context *context,
    ASSERT(!mState.mMapped);
    ASSERT(offset + length <= mState.mSize);
-    Error error =
+    mState.mMapPointer = nullptr;
-        mImpl->mapRange(rx::SafeGetImpl(context), offset, length, access, &mState.mMapPointer);
+    ANGLE_TRY(
-    if (error.isError())
+        mImpl->mapRange(rx::SafeGetImpl(context), offset, length, access, &mState.mMapPointer));
-    {
-        mState.mMapPointer = nullptr;
-        return error;
-    }
    mState.mMapped      = GL_TRUE;
    mState.mMapOffset   = static_cast<GLint64>(offset);
@@ -158,19 +150,15 @@ Error Buffer::mapRange(const Context *context,
        mIndexRangeCache.invalidateRange(static_cast<unsigned int>(offset), static_cast<unsigned int>(length));
    }
-    return error;
+    return NoError();
 }
 Error Buffer::unmap(const Context *context, GLboolean *result)
 {
    ASSERT(mState.mMapped);
-    Error error = mImpl->unmap(rx::SafeGetImpl(context), result);
+    *result = GL_FALSE;
-    if (error.isError())
+    ANGLE_TRY(mImpl->unmap(rx::SafeGetImpl(context), result));
-    {
-        *result = GL_FALSE;
-        return error;
-    }
    mState.mMapped      = GL_FALSE;
    mState.mMapPointer  = nullptr;
@@ -179,7 +167,7 @@ Error Buffer::unmap(const Context *context, GLboolean *result)
    mState.mAccess      = GL_WRITE_ONLY_OES;
    mState.mAccessFlags = 0;
-    return error;
+    return NoError();
 }
 void Buffer::onTransformFeedback()