commit 1395134c343867d63458f2c55a9bf3fce66803b9
author Jamie Madill <jmadill@chromium.org> Sun Sep 30 15:24:28 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Oct 03 21:47:57 2018 +0000
tree b3834a8380185b1201289a29f9fe1414128fcbb6
parent 4d422c290779afe1262ef16cbff497b48e29b49c

Remove more uses of gl::ErrorOrResult.

Only gl::LinkResult remains.

Bug: angleproject:2753
Change-Id: I5e9c68c11453e8ab9db4908451957d7b3db0b110
Reviewed-on: https://chromium-review.googlesource.com/c/1254044
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/gl/FramebufferGL.cpp

diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
index b9edd5b..c0327be 100644
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -482,33 +482,21 @@
     bool cannotSetDesiredRowLength =
         packState.rowLength && !GetImplAs<ContextGL>(context)->getNativeExtensions().packSubimage;
 
-    gl::Error retVal = gl::NoError();
     if (cannotSetDesiredRowLength || useOverlappingRowsWorkaround)
     {
-        retVal = readPixelsRowByRow(context, area, readFormat, readType, packState, pixels);
+        return readPixelsRowByRow(context, area, readFormat, readType, packState, pixels);
     }
-    else
+
+    bool useLastRowPaddingWorkaround = false;
+    if (workarounds.packLastRowSeparatelyForPaddingInclusion)
     {
-        gl::ErrorOrResult<bool> useLastRowPaddingWorkaround = false;
-        if (workarounds.packLastRowSeparatelyForPaddingInclusion)
-        {
-            useLastRowPaddingWorkaround = ShouldApplyLastRowPaddingWorkaround(
-                gl::Extents(area.width, area.height, 1), packState, packBuffer, readFormat,
-                readType, false, pixels);
-        }
-
-        if (useLastRowPaddingWorkaround.isError())
-        {
-            retVal = useLastRowPaddingWorkaround.getError();
-        }
-        else
-        {
-            retVal = readPixelsAllAtOnce(context, area, readFormat, readType, packState, pixels,
-                                         useLastRowPaddingWorkaround.getResult());
-        }
+        ANGLE_TRY(ShouldApplyLastRowPaddingWorkaround(gl::Extents(area.width, area.height, 1),
+                                                      packState, packBuffer, readFormat, readType,
+                                                      false, pixels, &useLastRowPaddingWorkaround));
     }
 
-    return retVal;
+    return readPixelsAllAtOnce(context, area, readFormat, readType, packState, pixels,
+                               useLastRowPaddingWorkaround);
 }
 
 Error FramebufferGL::blit(const gl::Context *context,