commit bce529e4c7f632b908ce553c62b2e59832442b08
author Geoff Lang <geofflang@chromium.org> Mon Dec 01 12:48:41 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Thu Dec 18 18:51:13 2014 +0000
tree 0987a89fdfaa8031f26d1e0537a03aba4c18a50d
parent b04dc82e4df421d535199b5398631fc6ba640ef3

Move ReadPixels to the Framebuffer object and Impl.

BUG=angle:841

Change-Id: I71deac9e755b5dfa010596cd1f8a213c24d895bf
Reviewed-on: https://chromium-review.googlesource.com/232691
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 20d0a20..b613ee9 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -906,17 +906,18 @@
         return false;
     }
 
-    if (!framebuffer->getReadColorbuffer())
+    const FramebufferAttachment *readBuffer = framebuffer->getReadColorbuffer();
+    if (!readBuffer)
     {
         context->recordError(Error(GL_INVALID_OPERATION));
         return false;
     }
 
-    GLenum currentInternalFormat, currentFormat, currentType;
+    GLenum currentFormat = framebuffer->getImplementationColorReadFormat();
+    GLenum currentType = framebuffer->getImplementationColorReadType();
+    GLenum currentInternalFormat = readBuffer->getActualFormat();
     GLuint clientVersion = context->getClientVersion();
 
-    context->getCurrentReadFormatType(&currentInternalFormat, &currentFormat, &currentType);
-
     bool validReadFormat = (clientVersion < 3) ? ValidES2ReadFormatType(context, format, type) :
                                                  ValidES3ReadFormatType(context, currentInternalFormat, format, type);