Fix B<->T copies of multiple array layers and unpacked rowpitch

When copying between buffers and textures, the bufferLayerSize didn't take the rowPitch into account and would in most cases just use the size of the copy. Fix this by using bufferSlicePitchBytes for src/dstLayerSize. Bug: swiftshader:152 Change-Id: I716f809bfa068d4836ef02366a01732fc2baa9d3 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46509 Presubmit-Ready: Corentin Wallez <cwallez@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Corentin Wallez <cwallez@google.com>

Fix B<->T copies of multiple array layers and unpacked rowpitch
e8dd233c · Corentin Wallez · Corentin Wallez · 0a8f44c5 · e8dd233c
Commit e8dd233c authored Jul 16, 2020 by Corentin Wallez Committed by Corentin Wallez Jul 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

VkImage.cpp src/Vulkan/VkImage.cpp +2 -8

No files found.
--- a/src/Vulkan/VkImage.cpp
+++ b/src/Vulkan/VkImage.cpp
@@ -524,36 +524,30 @@ void Image::copy(Buffer *buffer, const VkBufferImageCopy &region, bool bufferIsS
 	                     (imageSlicePitchBytes == bufferSlicePitchBytes);
 	VkDeviceSize copySize = 0;
-	VkDeviceSize bufferLayerSize = 0;
 	if(isSingleRow)
 	{
 		copySize = imageExtent.width * bytesPerBlock;
-		bufferLayerSize = copySize;
 	}
 	else if(isEntireRow && isSingleSlice)
 	{
 		copySize = imageExtent.height * imageRowPitchBytes;
-		bufferLayerSize = copySize;
 	}
 	else if(isEntireSlice)
 	{
 		copySize = imageExtent.depth * imageSlicePitchBytes;  // Copy multiple slices
-		bufferLayerSize = copySize;
 	}
 	else if(isEntireRow)  // Copy slice by slice
 	{
 		copySize = imageExtent.height * imageRowPitchBytes;
-		bufferLayerSize = copySize * imageExtent.depth;
 	}
 	else  // Copy row by row
 	{
 		copySize = imageExtent.width * bytesPerBlock;
-		bufferLayerSize = copySize * imageExtent.depth * imageExtent.height;
 	}
 	VkDeviceSize imageLayerSize = getLayerSize(aspect);
-	VkDeviceSize srcLayerSize = bufferIsSource ? bufferLayerSize : imageLayerSize;
+	VkDeviceSize srcLayerSize = bufferIsSource ? bufferSlicePitchBytes : imageLayerSize;
-	VkDeviceSize dstLayerSize = bufferIsSource ? imageLayerSize : bufferLayerSize;
+	VkDeviceSize dstLayerSize = bufferIsSource ? imageLayerSize : bufferSlicePitchBytes;
 	for(uint32_t i = 0; i < region.imageSubresource.layerCount; i++)
 	{