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/4080Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Unpack row length fix
46140099 · Alexis Hetu · Alexis Hétu · 2aa852f4 · 46140099
Commit 46140099 authored Oct 15, 2015 by Alexis Hetu Committed by Alexis Hétu Oct 15, 2015
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Image.cpp src/OpenGL/common/Image.cpp +1 -1

No files found.
--- a/src/OpenGL/common/Image.cpp
+++ b/src/OpenGL/common/Image.cpp
@@ -762,7 +762,7 @@ namespace egl
 	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;