wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Do not put storage buffer descriptors in the descriptor pool.

Browse Source 
They are never used.
This commit is contained in:
Giovanni Mascellani
2025-06-16 16:02:24 +02:00
committed by Henri Verbeet
parent f9f8b3a5a4
commit 7c6c176a7c
Notes: Henri Verbeet 2025-12-03 15:30:19 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1576
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/vulkan_utils.h
View File

@@ -371,7 +371,7 @@ static inline bool vulkan_test_context_init_device(struct vulkan_test_context *c
VkDescriptorPoolCreateInfo descriptor_pool_desc = {.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO}; VkDescriptorPoolCreateInfo descriptor_pool_desc = {.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO};
VkCommandBufferAllocateInfo cmd_buffer_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO}; VkCommandBufferAllocateInfo cmd_buffer_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO};
VkCommandPoolCreateInfo command_pool_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO}; VkCommandPoolCreateInfo command_pool_desc = {.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO};
VkDescriptorPoolSize descriptor_pool_sizes[6]; VkDescriptorPoolSize descriptor_pool_sizes[5];
VkDevice device; VkDevice device;
VkResult vr; VkResult vr;
@@ -402,16 +402,14 @@ static inline bool vulkan_test_context_init_device(struct vulkan_test_context *c
descriptor_pool_sizes[0].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; descriptor_pool_sizes[0].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
descriptor_pool_sizes[0].descriptorCount = max_resource_count; descriptor_pool_sizes[0].descriptorCount = max_resource_count;
descriptor_pool_sizes[1].type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER; descriptor_pool_sizes[1].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
descriptor_pool_sizes[1].descriptorCount = max_resource_count; descriptor_pool_sizes[1].descriptorCount = max_resource_count;
descriptor_pool_sizes[2].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor_pool_sizes[2].type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
descriptor_pool_sizes[2].descriptorCount = max_resource_count; descriptor_pool_sizes[2].descriptorCount = max_resource_count;
descriptor_pool_sizes[3].type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; descriptor_pool_sizes[3].type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
descriptor_pool_sizes[3].descriptorCount = max_resource_count; descriptor_pool_sizes[3].descriptorCount = max_resource_count;
descriptor_pool_sizes[4].type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; descriptor_pool_sizes[4].type = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_pool_sizes[4].descriptorCount = max_resource_count; descriptor_pool_sizes[4].descriptorCount = max_sampler_count;
descriptor_pool_sizes[5].type = VK_DESCRIPTOR_TYPE_SAMPLER;
descriptor_pool_sizes[5].descriptorCount = max_sampler_count;
descriptor_pool_desc.maxSets = 1; descriptor_pool_desc.maxSets = 1;
descriptor_pool_desc.poolSizeCount = ARRAY_SIZE(descriptor_pool_sizes) - !max_sampler_count; descriptor_pool_desc.poolSizeCount = ARRAY_SIZE(descriptor_pool_sizes) - !max_sampler_count;