Add padding between slices

When doing multisample rendering, we need to avoid conflicts between render target writes to adjacent slices. - Worst case is an unaligned 16-byte write hitting the last byte of the image, + 15 bytes beyond - Ensure that slices are always 16-byte aligned Test: dEQP-VK.renderpass.* Bug: b/131719815 Change-Id: I5c3ee7c66f0f656fdc85d7388ca907e0173381e5 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30608Tested-by: Chris Forbes <chrisforbes@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Add padding between slices
b01f2559 · Chris Forbes · 583f6425 · b01f2559 · b01f2559
Commit b01f2559 authored May 03, 2019 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

VkFormat.cpp src/Vulkan/VkFormat.cpp +6 -1

VkFormat.h src/Vulkan/VkFormat.h +1 -0

No files found.
--- a/src/Vulkan/VkFormat.cpp
+++ b/src/Vulkan/VkFormat.cpp
@@ -1500,7 +1500,7 @@ int Format::pitchB(int width, int border, bool target) const
 	}
 }

-int Format::sliceB(int width, int height, int border, bool target) const
+int Format::sliceBUnpadded(int width, int height, int border, bool target) const
 {
 	height += 2 * border;

@@ -1561,6 +1561,11 @@ int Format::sliceB(int width, int height, int border, bool target) const
 	}
 }

+int Format::sliceB(int width, int height, int border, bool target) const
+{
+	return sw::align<16>(sliceBUnpadded(width, height, border, target) + 15);
+}
+
 bool Format::getScale(sw::float4 &scale) const
 {
 	switch(format)

--- a/src/Vulkan/VkFormat.h
+++ b/src/Vulkan/VkFormat.h
@@ -71,6 +71,7 @@ public:

 private:
 	VkFormat compatibleFormat() const;
+	int sliceBUnpadded(int width, int height, int border, bool target) const;

 	VkFormat format = VK_FORMAT_UNDEFINED;
 };