commit 4ecc9d4073ce33f9ad16c89f089912364f98dab5
author Chris Forbes <chrisforbes@google.com> Thu Mar 21 11:23:28 2019 -0700
committer Chris Forbes <chrisforbes@google.com> Thu Mar 21 20:24:49 2019 +0000
tree 19926bdcc85017eb5c49e515f2c3a9afc3973083
parent e7b2a058e9f61a87895edfdeb140b075236327f7

Ensure image strides are always suitable for the rasterizer

Bug: b/129069789
Test: dEQP-VK.glsl.derivate.*
Change-Id: Iac1b5ed51dae0f6d8937b2162eb0a662d02b34ba
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27729
Presubmit-Ready: Chris Forbes <chrisforbes@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Vulkan/VkImage.cpp

diff --git a/src/Vulkan/VkImage.cpp b/src/Vulkan/VkImage.cpp
index 0702d6b..8ac5bf3 100644
--- a/src/Vulkan/VkImage.cpp
+++ b/src/Vulkan/VkImage.cpp
@@ -377,7 +377,7 @@
 	// Depth and Stencil pitch should be computed separately
 	ASSERT((aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) !=
 	                (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
-	return getFormat(aspect).pitchB(getMipLevelExtent(mipLevel).width, isCube() ? 1 : 0, false);
+	return getFormat(aspect).pitchB(getMipLevelExtent(mipLevel).width, isCube() ? 1 : 0, true);
 }
 
 int Image::slicePitchBytes(VkImageAspectFlagBits aspect, uint32_t mipLevel) const
@@ -386,7 +386,7 @@
 	ASSERT((aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) !=
 	                (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
 	VkExtent3D mipLevelExtent = getMipLevelExtent(mipLevel);
-	return getFormat(aspect).sliceB(mipLevelExtent.width, mipLevelExtent.height, isCube() ? 1 : 0, false);
+	return getFormat(aspect).sliceB(mipLevelExtent.width, mipLevelExtent.height, isCube() ? 1 : 0, true);
 }
 
 int Image::bytesPerTexel(VkImageAspectFlagBits aspect) const