Pass the gralloc buffer stride to sw::Surface.

src/OpenGL/common/Image.hpp

@@ -54,8 +54,8 @@ public:
 		referenceCount = 1;
 	}
 
-	Image(Texture *parentTexture, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type)
-		: sw::Surface(getParentResource(parentTexture), width, height, depth, SelectInternalFormat(format, type), true, true),
+	Image(Texture *parentTexture, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, int pitchP = 0)
+		: sw::Surface(getParentResource(parentTexture), width, height, depth, SelectInternalFormat(format, type), true, true, pitchP),
 		  width(width), height(height), format(format), type(type), internalFormat(SelectInternalFormat(format, type)), depth(depth),
 		  parentTexture(parentTexture)
 	{
@@ -182,12 +182,13 @@ public:
 	explicit AndroidNativeImage(ANativeWindowBuffer *nativeBuffer)
 		: egl::Image(0, nativeBuffer->width, nativeBuffer->height, 1,
 		             GLPixelFormatFromAndroid(nativeBuffer->format),
-		             GLPixelTypeFromAndroid(nativeBuffer->format)),
+		             GLPixelTypeFromAndroid(nativeBuffer->format),
+		             nativeBuffer->stride),
 		  nativeBuffer(nativeBuffer)
-{
-    nativeBuffer->common.incRef(&nativeBuffer->common);
-    markShared();
-}
+	{
+		nativeBuffer->common.incRef(&nativeBuffer->common);
+		markShared();
+	}
 
 private:
 	ANativeWindowBuffer *nativeBuffer;

src/Renderer/Surface.cpp

@@ -1205,7 +1205,7 @@ namespace sw
 		paletteUsed = 0;
 	}
 
-	Surface::Surface(Resource *texture, int width, int height, int depth, Format format, bool lockable, bool renderTarget) : lockable(lockable), renderTarget(renderTarget)
+	Surface::Surface(Resource *texture, int width, int height, int depth, Format format, bool lockable, bool renderTarget, int pitchPprovided) : lockable(lockable), renderTarget(renderTarget)
 	{
 		resource = texture ? texture : new Resource(0);
 		hasParent = texture != 0;
@@ -1231,8 +1231,8 @@ namespace sw
 		internal.depth = depth;
 		internal.format = selectInternalFormat(format);
 		internal.bytes = bytes(internal.format);
-		internal.pitchB = pitchB(internal.width, internal.format, renderTarget);
-		internal.pitchP = pitchP(internal.width, internal.format, renderTarget);
+		internal.pitchB = !pitchPprovided ? pitchB(internal.width, internal.format, renderTarget) : pitchPprovided * internal.bytes;
+		internal.pitchP = !pitchPprovided ? pitchP(internal.width, internal.format, renderTarget) : pitchPprovided;
 		internal.sliceB = sliceB(internal.width, internal.height, internal.format, renderTarget);
 		internal.sliceP = sliceP(internal.width, internal.height, internal.format, renderTarget);
 		internal.lock = LOCK_UNLOCKED;

src/Renderer/Surface.hpp

@@ -237,14 +237,14 @@ namespace sw
 			int sliceP;
 			Format format;
 			Lock lock;
-			
+
 			bool dirty;
 		};
 
 	public:
 		Surface(int width, int height, int depth, Format format, void *pixels, int pitch, int slice);
-		Surface(Resource *texture, int width, int height, int depth, Format format, bool lockable, bool renderTarget);
-		
+		Surface(Resource *texture, int width, int height, int depth, Format format, bool lockable, bool renderTarget, int pitchP = 0);
+
 		virtual ~Surface();
 
 		inline void *lock(int x, int y, int z, Lock lock, Accessor client, bool internal = false);