[PATCH vkd3d 6/6] vkd3d: Remove unused d3d12_root_signature_init_descriptor_pool_size().

[Józef Kucia]

From: Józef Kucia <jkucia at codeweavers.com>

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 libs/vkd3d/command.c       |  2 +-
 libs/vkd3d/state.c         | 80 --------------------------------------
 libs/vkd3d/vkd3d_private.h |  3 --
 3 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index ac7e658d5794..ae88910a992c 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -2821,7 +2821,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis
     struct d3d12_desc *base_descriptor;
     unsigned int i;
 
-    if (!rs || !rs->pool_size_count || !rs->vk_set_layout)
+    if (!rs || !rs->vk_set_layout)
         return;
 
     if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask)
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 8ddbd4ff1b23..12a711b4ab33 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -64,8 +64,6 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa
 
     if (root_signature->vk_pipeline_layout)
         VK_CALL(vkDestroyPipelineLayout(device->vk_device, root_signature->vk_pipeline_layout, NULL));
-    if (root_signature->pool_sizes)
-        vkd3d_free(root_signature->pool_sizes);
     if (root_signature->vk_set_layout)
         VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, root_signature->vk_set_layout, NULL));
     if (root_signature->vk_push_set_layout)
@@ -430,80 +428,6 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i
     return S_OK;
 }
 
-static HRESULT d3d12_root_signature_init_descriptor_pool_size(struct d3d12_root_signature *root_signature,
-        const struct d3d12_root_signature_info *info)
-{
-    unsigned int i;
-
-    root_signature->pool_size_count = 0;
-    if (info->cbv_count)
-        ++root_signature->pool_size_count;
-    if (info->buffer_srv_count || info->srv_count)
-        ++root_signature->pool_size_count;
-    if (info->srv_count)
-        ++root_signature->pool_size_count;
-    if (info->buffer_uav_count || info->uav_count)
-        ++root_signature->pool_size_count;
-    if (info->uav_count)
-        ++root_signature->pool_size_count;
-    if (info->sampler_count)
-        ++root_signature->pool_size_count;
-
-    if (root_signature->pool_size_count)
-    {
-        if (!(root_signature->pool_sizes = vkd3d_calloc(root_signature->pool_size_count,
-                sizeof(*root_signature->pool_sizes))))
-        {
-            return E_OUTOFMEMORY;
-        }
-
-        i = 0;
-        if (info->cbv_count)
-        {
-            root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
-            root_signature->pool_sizes[i++].descriptorCount = info->cbv_count;
-        }
-        /* Each D3D12_DESCRIPTOR_RANGE_TYPE_SRV descriptor can be either a
-         * buffer or a texture view. Allocate one buffer view and one image
-         * view Vulkan descriptor for each. */
-        if (info->buffer_srv_count || info->srv_count)
-        {
-            root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
-            root_signature->pool_sizes[i++].descriptorCount = info->buffer_srv_count + info->srv_count;
-        }
-        if (info->srv_count)
-        {
-            root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
-            root_signature->pool_sizes[i++].descriptorCount = info->srv_count;
-        }
-        /* Each D3D12_DESCRIPTOR_RANGE_TYPE_UAV descriptor can be either a
-         * buffer or a texture view. Allocate one buffer view and one image
-         * view Vulkan descriptor for each. */
-        if (info->buffer_uav_count || info->uav_count)
-        {
-            root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
-            root_signature->pool_sizes[i++].descriptorCount = info->buffer_uav_count + info->uav_count;
-        }
-        if (info->uav_count)
-        {
-            root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
-            root_signature->pool_sizes[i++].descriptorCount = info->uav_count;
-        }
-        if (info->sampler_count)
-        {
-            root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_SAMPLER;
-            root_signature->pool_sizes[i++].descriptorCount = info->sampler_count;
-        }
-    }
-    else
-    {
-        root_signature->pool_sizes = NULL;
-        root_signature->pool_size_count = 0;
-    }
-
-    return S_OK;
-}
-
 static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signature *root_signature,
         const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info,
         struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1],
@@ -874,7 +798,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
     root_signature->refcount = 1;
 
     root_signature->vk_pipeline_layout = VK_NULL_HANDLE;
-    root_signature->pool_sizes = NULL;
     root_signature->vk_push_set_layout = VK_NULL_HANDLE;
     root_signature->vk_set_layout = VK_NULL_HANDLE;
     root_signature->parameters = NULL;
@@ -925,9 +848,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
         goto fail;
     context.current_binding = binding_desc;
 
-    if (FAILED(hr = d3d12_root_signature_init_descriptor_pool_size(root_signature, &info)))
-        goto fail;
-
     if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context)))
         goto fail;
 
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 51bfba967c7a..a8f42cf3b10a 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -661,9 +661,6 @@ struct d3d12_root_signature
     VkDescriptorSetLayout vk_push_set_layout;
     VkDescriptorSetLayout vk_set_layout;
 
-    VkDescriptorPoolSize *pool_sizes;
-    size_t pool_size_count;
-
     struct d3d12_root_parameter *parameters;
     unsigned int parameter_count;
     uint32_t main_set;
-- 
2.21.0