From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Fri, 14 Sep 2018 12:56:38 +0000 (+0200)
Subject: radv: fix descriptor pool allocation size
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90819abb56f6b1a0cd4946b13b6caf24fb46e500;p=mesa.git

radv: fix descriptor pool allocation size

The size has to be multiplied by the number of sets.

This gets rid of the OUT_OF_POOL_KHR error and fixes
a crash with the Tangrams demo.

CC: 18.1 18.2 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index c4341f6ac52..49d0811bb06 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -569,9 +569,10 @@ VkResult radv_CreateDescriptorPool(
 	}
 
 	if (!(pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT)) {
-		uint64_t host_size = pCreateInfo->maxSets * sizeof(struct radv_descriptor_set);
+		uint64_t host_size = sizeof(struct radv_descriptor_set);
 		host_size += sizeof(struct radeon_winsys_bo*) * bo_count;
 		host_size += sizeof(struct radv_descriptor_range) * range_count;
+		host_size *= pCreateInfo->maxSets;
 		size += host_size;
 	} else {
 		size += sizeof(struct radv_descriptor_pool_entry) * pCreateInfo->maxSets;