From bd3db3d6655beeb3da817a96d524f537092e386b Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 23 Feb 2016 17:04:19 -0800 Subject: anv/meta: Allocate descriptor pools on-the-fly We can't use a global descriptor pool like we were because it's not thread-safe. For now, we'll allocate them on-the-fly and that should work fine. At some point in the future, we could do something where we stack-allocate them or allocate them out of one of the state streams. --- src/intel/vulkan/anv_meta.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'src/intel/vulkan/anv_meta.c') diff --git a/src/intel/vulkan/anv_meta.c b/src/intel/vulkan/anv_meta.c index 683a1623cc3..82944ea1a92 100644 --- a/src/intel/vulkan/anv_meta.c +++ b/src/intel/vulkan/anv_meta.c @@ -138,27 +138,6 @@ anv_device_init_meta(struct anv_device *device) .pfnFree = meta_free, }; - const VkDescriptorPoolCreateInfo create_info = { - .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO, - .pNext = NULL, - .flags = 0, - .maxSets = 1, - .poolSizeCount = 1, - .pPoolSizes = (VkDescriptorPoolSize[]) { - { - .type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, - .descriptorCount = 1 - }, - } - }; - - result = anv_CreateDescriptorPool(anv_device_to_handle(device), - &create_info, - &device->meta_state.alloc, - &device->meta_state.desc_pool); - if (result != VK_SUCCESS) - goto fail_desc_pool; - result = anv_device_init_meta_clear_state(device); if (result != VK_SUCCESS) goto fail_clear; @@ -178,10 +157,6 @@ fail_blit: fail_resolve: anv_device_finish_meta_clear_state(device); fail_clear: - anv_DestroyDescriptorPool(anv_device_to_handle(device), - device->meta_state.desc_pool, - &device->meta_state.alloc); -fail_desc_pool: return result; } -- cgit v1.2.3