Descriptor Pool alignment checks

Make sure all allocations within the pool are 16 bytes aligned Bug b/137554711 Change-Id: I7e9531b720ae07390e0089768f92fd95c62d6afb Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/33250Tested-by: Alexis Hétu <sugoi@google.com> Presubmit-Ready: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Descriptor Pool alignment checks
f5182abb · Alexis Hetu · Alexis Hétu · 6d55ba73 · f5182abb · f5182abb
Commit f5182abb authored Jun 21, 2019 by Alexis Hetu Committed by Alexis Hétu Jul 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

VkDescriptorPool.cpp src/Vulkan/VkDescriptorPool.cpp +2 -2

VkDescriptorSet.hpp src/Vulkan/VkDescriptorSet.hpp +1 -1

No files found.
--- a/src/Vulkan/VkDescriptorPool.cpp
+++ b/src/Vulkan/VkDescriptorPool.cpp
@@ -51,12 +51,12 @@ void DescriptorPool::destroy(const VkAllocationCallbacks* pAllocator)

 size_t DescriptorPool::ComputeRequiredAllocationSize(const VkDescriptorPoolCreateInfo* pCreateInfo)
 {
-	size_t size = pCreateInfo->maxSets * sizeof(DescriptorSetHeader);
+	size_t size = pCreateInfo->maxSets * sw::align(sizeof(DescriptorSetHeader), 16);

 	for(uint32_t i = 0; i < pCreateInfo->poolSizeCount; i++)
 	{
 		size += pCreateInfo->pPoolSizes[i].descriptorCount *
-		        DescriptorSetLayout::GetDescriptorSize(pCreateInfo->pPoolSizes[i].type);
+		        sw::align(DescriptorSetLayout::GetDescriptorSize(pCreateInfo->pPoolSizes[i].type), 16);
 	}

 	return size;

--- a/src/Vulkan/VkDescriptorSet.hpp
+++ b/src/Vulkan/VkDescriptorSet.hpp
@@ -29,7 +29,7 @@ namespace vk
 		DescriptorSetLayout* layout;
 	};

-	class DescriptorSet
+	class alignas(16) DescriptorSet
 	{
 	public:
 		static inline DescriptorSet* Cast(VkDescriptorSet object)