commit b8aee3bc1da54923900e57258923b0c68b41ed57
author Minmin Gong <mgong@microsoft.com> Tue Jan 27 14:42:36 2015 -0800
committer Geoff Lang <geofflang@chromium.org> Mon Feb 02 22:53:04 2015 +0000
tree 193825cde21144aee5cc85b973b9ed02f04b61e5
parent 1d57ad40439cd30e43a4b245caaed7f191137b46

Add UNPACK_ROW_LENGTH support to D3D11 renderer

Change-Id: I31ccffddcb04a45f19d3c3eb9a396c30e794b218
Reviewed-on: https://chromium-review.googlesource.com/243951
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Minmin Gong <mgong@microsoft.com>

src/libANGLE/formatutils.cpp

diff --git a/src/libANGLE/formatutils.cpp b/src/libANGLE/formatutils.cpp
index 0ebc67a..c822a96 100644
--- a/src/libANGLE/formatutils.cpp
+++ b/src/libANGLE/formatutils.cpp
@@ -560,15 +560,25 @@
     }
 }
 
-GLuint InternalFormat::computeRowPitch(GLenum formatType, GLsizei width, GLint alignment) const
+GLuint InternalFormat::computeRowPitch(GLenum formatType, GLsizei width, GLint alignment, GLint rowLength) const
 {
     ASSERT(alignment > 0 && isPow2(alignment));
-    return rx::roundUp(computeBlockSize(formatType, width, 1), static_cast<GLuint>(alignment));
+    GLuint rowBytes;
+    if (rowLength > 0)
+    {
+        ASSERT(!compressed);
+        rowBytes = pixelBytes * rowLength;
+    }
+    else
+    {
+        rowBytes = computeBlockSize(formatType, width, 1);
+    }
+    return rx::roundUp(rowBytes, static_cast<GLuint>(alignment));
 }
 
-GLuint InternalFormat::computeDepthPitch(GLenum formatType, GLsizei width, GLsizei height, GLint alignment) const
+GLuint InternalFormat::computeDepthPitch(GLenum formatType, GLsizei width, GLsizei height, GLint alignment, GLint rowLength) const
 {
-    return computeRowPitch(formatType, width, alignment) * height;
+    return computeRowPitch(formatType, width, alignment, rowLength) * height;
 }
 
 GLuint InternalFormat::computeBlockSize(GLenum formatType, GLsizei width, GLsizei height) const