Ensure compressed image copy is height compliant

Image copy operations on compressed formats must have dimensions that are multiples of the block dimensions, unless the extent dimension + its corresponding offset is equal to the image subresource dimension. Bug: b/168025369 Change-Id: I3e77bfefe78347d4635128ece10f9d48aef40daa Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48188Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Sean Risser <srisser@google.com> Commit-Queue: Alexis Hétu <sugoi@google.com>

Ensure compressed image copy is height compliant
2eed61ff · Nicolas Capens · swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com · a98fb3f8 · 2eed61ff
Commit 2eed61ff authored Dec 14, 2020 by Nicolas Capens Committed by swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com Mar 24, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

VkImage.cpp src/Vulkan/VkImage.cpp +7 -4

No files found.
--- a/src/Vulkan/VkImage.cpp
+++ b/src/Vulkan/VkImage.cpp
@@ -703,6 +703,7 @@ VkExtent2D Image::bufferExtentInBlocks(const VkExtent2D &extent, const VkBufferI
 	VkExtent2D adjustedExtent = extent;
 	VkImageAspectFlagBits aspect = static_cast<VkImageAspectFlagBits>(region.imageSubresource.aspectMask);
 	Format usedFormat = getFormat(aspect);
+
 	if(region.bufferRowLength != 0)
 	{
 		adjustedExtent.width = region.bufferRowLength;
@@ -710,10 +711,11 @@ VkExtent2D Image::bufferExtentInBlocks(const VkExtent2D &extent, const VkBufferI
 		if(usedFormat.isCompressed())
 		{
 			int blockWidth = usedFormat.blockWidth();
-			ASSERT((adjustedExtent.width % blockWidth) == 0);
-			adjustedExtent.width /= blockWidth;
+			ASSERT((adjustedExtent.width % blockWidth == 0) || (adjustedExtent.width + region.imageOffset.x == extent.width));
+			adjustedExtent.width = (region.bufferRowLength + blockWidth - 1) / blockWidth;
 		}
 	}
+
 	if(region.bufferImageHeight != 0)
 	{
 		adjustedExtent.height = region.bufferImageHeight;
@@ -721,10 +723,11 @@ VkExtent2D Image::bufferExtentInBlocks(const VkExtent2D &extent, const VkBufferI
 		if(usedFormat.isCompressed())
 		{
 			int blockHeight = usedFormat.blockHeight();
-			ASSERT((adjustedExtent.height % blockHeight) == 0);
-			adjustedExtent.height /= blockHeight;
+			ASSERT((adjustedExtent.height % blockHeight == 0) || (adjustedExtent.height + region.imageOffset.y == extent.height));
+			adjustedExtent.height = (region.bufferImageHeight + blockHeight - 1) / blockHeight;
 		}
 	}
+
 	return adjustedExtent;
 }