commit 4614009956df0a0a0438b8a858d8e9ca73b0fdfc
author Alexis Hetu <sugoi@google.com> Thu Oct 15 17:05:30 2015 -0400
committer Alexis Hétu <sugoi@google.com> Thu Oct 15 21:32:51 2015 +0000
tree 3d4dac41986932b9126b757d317dc2b327d615fd
parent 2aa852f4c1246ef8ab2a46d5d3f6a981c2ddda0a

Unpack row length fix

The unpack row length was supposed to replace the width, not the
pitch, of the input image, which explains why related tests were
failing.

Change-Id: I7bd46e057bae4113b31d072fd6748d9dd6043feb
Reviewed-on: https://swiftshader-review.googlesource.com/4080
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/common/Image.cpp

diff --git a/src/OpenGL/common/Image.cpp b/src/OpenGL/common/Image.cpp
index a0f7ac6..b77f6a7 100644
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
@@ -762,7 +762,7 @@
 
 	void Image::loadImageData(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const UnpackInfo& unpackInfo, const void *input)
 	{
-		GLsizei inputPitch  = (unpackInfo.rowLength == 0) ? ComputePitch(width, format, type, unpackInfo.alignment) : unpackInfo.rowLength;
+		GLsizei inputPitch = ComputePitch((unpackInfo.rowLength == 0) ? width : unpackInfo.rowLength, format, type, unpackInfo.alignment);
 		GLsizei inputHeight = (unpackInfo.imageHeight == 0) ? height : unpackInfo.imageHeight;
 		input = ((char*)input) + (unpackInfo.skipImages * inputHeight + unpackInfo.skipRows) * inputPitch + unpackInfo.skipPixels;