Apply the pixel pack state before ReadPixels in FramebufferGL.

This ensures that the PBO is bound because it does not have a dirty bit yet. BUG=angleproject:1149 BUG=angleproject:885 Change-Id: Iad96abc4dec4e6ac8187975c7638dfd7f18951e7 Reviewed-on: https://chromium-review.googlesource.com/296963Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Apply the pixel pack state before ReadPixels in FramebufferGL.
da34d002 · Geoff Lang · d0f9fdc7 · da34d002
Commit da34d002 authored Sep 04, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

FramebufferGL.cpp src/libANGLE/renderer/gl/FramebufferGL.cpp +3 -4

No files found.
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -241,11 +241,10 @@ GLenum FramebufferGL::getImplementationColorReadType() const
 gl::Error FramebufferGL::readPixels(const gl::State &state, const gl::Rectangle &area, GLenum format, GLenum type, GLvoid *pixels) const
 {
+    // TODO: don't sync the pixel pack state here once the dirty bits contain the pixel pack buffer
+    // binding
    const gl::PixelPackState &packState = state.getPackState();
-    if (packState.pixelBuffer.get() != nullptr)
+    mStateManager->setPixelPackState(packState);
-    {
-        UNIMPLEMENTED();
-    }
    mStateManager->bindFramebuffer(GL_READ_FRAMEBUFFER, mFramebufferID);
    mFunctions->readPixels(area.x, area.y, area.width, area.height, format, type, pixels);