Revert "radv: fix descriptor pool allocation size"

This reverts commit 90819abb56f6b1a0cd4946b13b6caf24fb46e500.

This logic was wrong, the original code is correct. The direct
impact is that we allocate up to approximately a squared amount
of memory compared to what we should allocate.

Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index 49d0811bb06e9dd352ccb7dbd5f5f53895257494..c4341f6ac52288b0f38918f1d302978f04b58767 100644 (file)
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -569,10 +569,9 @@ VkResult radv_CreateDescriptorPool(
        }
 
        if (!(pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT)) {
-               uint64_t host_size = sizeof(struct radv_descriptor_set);
+               uint64_t host_size = pCreateInfo->maxSets * 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;