commit 63d2fc7f40d626342a0f9a82457b3fe0a81efca7
author Geoff Lang <geofflang@chromium.org> Fri Jul 25 14:51:41 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Mon Sep 08 19:09:01 2014 +0000
tree 607e85b029d67f3fe85ce110543af1236906027b
parent cc79b8c6b3c713904fa6d0613018b3e2f7fd8eac

Update the ReadPixels calls to return Error objects instead of calling gl::error.

BUG=angle:520

Change-Id: I2ead221e7d1f02cf088b60d0e98376fcd68dde8e
Reviewed-on: https://chromium-review.googlesource.com/211441
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 9b48f8b..28e3d28 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -3693,7 +3693,12 @@
             return;
         }
 
-        context->readPixels(x, y, width, height, format, type, &bufSize, data);
+        gl::Error error = context->readPixels(x, y, width, height, format, type, &bufSize, data);
+        if (error.isError())
+        {
+            context->recordError(error);
+            return;
+        }
     }
 }
 
@@ -3719,7 +3724,12 @@
             return;
         }
 
-        context->readPixels(x, y, width, height, format, type, NULL, pixels);
+        gl::Error error = context->readPixels(x, y, width, height, format, type, NULL, pixels);
+        if (error.isError())
+        {
+            context->recordError(error);
+            return;
+        }
     }
 }