Implement pass-through pack state params.

src/libANGLE/State.cpp

@@ -1082,6 +1082,11 @@ const PixelPackState &State::getPackState() const
     return mPack;
 }
 
+PixelPackState &State::getPackState()
+{
+    return mPack;
+}
+
 void State::setUnpackAlignment(GLint alignment)
 {
     mUnpack.alignment = alignment;

src/libANGLE/State.h

@@ -237,6 +237,7 @@ class State
     void setPackReverseRowOrder(bool reverseRowOrder);
     bool getPackReverseRowOrder() const;
     const PixelPackState &getPackState() const;
+    PixelPackState &getPackState();
 
     // Pixel unpack state manipulation
     void setUnpackAlignment(GLint alignment);

src/libANGLE/angletypes.h

@@ -217,15 +217,24 @@ struct PixelPackState
     BindingPointer<Buffer> pixelBuffer;
     GLint alignment;
     bool reverseRowOrder;
+    GLint rowLength;
+    GLint skipRows;
+    GLint skipPixels;
 
     PixelPackState()
         : alignment(4),
-          reverseRowOrder(false)
+          reverseRowOrder(false),
+          rowLength(0),
+          skipRows(0),
+          skipPixels(0)
     {}
 
     explicit PixelPackState(GLint alignmentIn, bool reverseRowOrderIn)
         : alignment(alignmentIn),
-          reverseRowOrder(reverseRowOrderIn)
+          reverseRowOrder(reverseRowOrderIn),
+          rowLength(0),
+          skipRows(0),
+          skipPixels(0)
     {}
 };
 

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -299,11 +299,19 @@ GLenum FramebufferD3D::getImplementationColorReadType() const
 
 gl::Error FramebufferD3D::readPixels(const gl::State &state, const gl::Rectangle &area, GLenum format, GLenum type, GLvoid *pixels) const
 {
+    const gl::PixelPackState &packState = state.getPackState();
+
+    if (packState.rowLength != 0 || packState.skipRows != 0 || packState.skipPixels != 0)
+    {
+        UNIMPLEMENTED();
+        return gl::Error(GL_INVALID_OPERATION, "invalid pixel store parameters in readPixels");
+    }
+
     GLenum sizedInternalFormat = gl::GetSizedInternalFormat(format, type);
     const gl::InternalFormat &sizedFormatInfo = gl::GetInternalFormatInfo(sizedInternalFormat);
-    GLuint outputPitch = sizedFormatInfo.computeRowPitch(type, area.width, state.getPackAlignment(), 0);
+    GLuint outputPitch = sizedFormatInfo.computeRowPitch(type, area.width, packState.alignment, 0);
 
-    return readPixels(area, format, type, outputPitch, state.getPackState(), reinterpret_cast<uint8_t*>(pixels));
+    return readPixels(area, format, type, outputPitch, packState, reinterpret_cast<uint8_t*>(pixels));
 }
 
 gl::Error FramebufferD3D::blit(const gl::State &state, const gl::Rectangle &sourceArea, const gl::Rectangle &destArea,

src/libANGLE/renderer/gl/FramebufferGL.cpp

@@ -9,6 +9,7 @@
 #include "libANGLE/renderer/gl/FramebufferGL.h"
 
 #include "common/debug.h"
+#include "libANGLE/State.h"
 
 namespace rx
 {
@@ -106,6 +107,14 @@ GLenum FramebufferGL::getImplementationColorReadType() const
 
 gl::Error FramebufferGL::readPixels(const gl::State &state, const gl::Rectangle &area, GLenum format, GLenum type, GLvoid *pixels) const
 {
+    const gl::PixelPackState &packState = state.getPackState();
+
+    if (packState.rowLength != 0 || packState.skipRows != 0 || packState.skipPixels != 0)
+    {
+        UNIMPLEMENTED();
+        return gl::Error(GL_INVALID_OPERATION, "invalid pixel store parameters in readPixels");
+    }
+
     UNIMPLEMENTED();
     return gl::Error(GL_INVALID_OPERATION);
 }

src/libGLESv2/entry_points_gles_2_0.cpp

@@ -3232,10 +3232,18 @@ void GL_APIENTRY PixelStorei(GLenum pname, GLint param)
             break;
 
           case GL_PACK_ROW_LENGTH:
+            ASSERT(context->getClientVersion() >= 3);
+            state.getPackState().rowLength = param;
+            break;
+
           case GL_PACK_SKIP_ROWS:
+            ASSERT(context->getClientVersion() >= 3);
+            state.getPackState().skipRows = param;
+            break;
+
           case GL_PACK_SKIP_PIXELS:
             ASSERT(context->getClientVersion() >= 3);
-            UNIMPLEMENTED();
+            state.getPackState().skipPixels = param;
             break;
 
           default: