mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Introduce global descriptor pools for static samplers. 

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-08-24 16:57:54 +02:00 committed by Hans-Kristian Arntzen
parent d4f13b755f
commit a862d02c4c
2 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
libs/vkd3d/resource.c
View File

@ -1662,6 +1662,8 @@ HRESULT vkd3d_sampler_state_init(struct vkd3d_sampler_state *state,
{
int rc;
memset(state, 0, sizeof(*state));
if ((rc = pthread_mutex_init(&state->mutex, NULL)))
return hresult_from_errno(rc);
@ -1675,6 +1677,11 @@ void vkd3d_sampler_state_cleanup(struct vkd3d_sampler_state *state,
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
uint32_t i;
for (i = 0; i < state->vk_descriptor_pool_count; i++)
VK_CALL(vkDestroyDescriptorPool(device->vk_device, state->vk_descriptor_pools[i], NULL));
vkd3d_free(state->vk_descriptor_pools);
for (i = 0; i < state->map.entry_count; i++)
{
struct vkd3d_sampler_entry *e = (struct vkd3d_sampler_entry *)hash_map_get_entry(&state->map, i);
@ -1727,6 +1734,98 @@ HRESULT vkd3d_sampler_state_create_static_sampler(struct vkd3d_sampler_state *st
return S_OK;
}
static VkResult vkd3d_sampler_state_create_descriptor_pool(struct d3d12_device *device, VkDescriptorPool *vk_pool)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VkDescriptorPoolCreateInfo pool_info;
VkDescriptorPoolSize pool_size;
pool_size.type = VK_DESCRIPTOR_TYPE_SAMPLER;
pool_size.descriptorCount = 16384;
pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
pool_info.pNext = NULL;
pool_info.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
pool_info.maxSets = 4096;
pool_info.poolSizeCount = 1;
pool_info.pPoolSizes = &pool_size;
return VK_CALL(vkCreateDescriptorPool(device->vk_device, &pool_info, NULL, vk_pool));
}
HRESULT vkd3d_sampler_state_allocate_descriptor_set(struct vkd3d_sampler_state *state,
struct d3d12_device *device, VkDescriptorSetLayout vk_layout, VkDescriptorSet *vk_set,
VkDescriptorPool *vk_pool)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VkResult vr = VK_ERROR_OUT_OF_POOL_MEMORY;
VkDescriptorSetAllocateInfo alloc_info;
size_t i;
int rc;
if ((rc = pthread_mutex_lock(&state->mutex)))
{
ERR("Failed to lock mutex, rc %d.\n", rc);
return hresult_from_errno(rc);
}
alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
alloc_info.pNext = NULL;
alloc_info.descriptorSetCount = 1;
alloc_info.pSetLayouts = &vk_layout;
for (i = 0; i < state->vk_descriptor_pool_count; i++)
{
alloc_info.descriptorPool = state->vk_descriptor_pools[i];
vr = VK_CALL(vkAllocateDescriptorSets(device->vk_device, &alloc_info, vk_set));
if (vr == VK_SUCCESS)
{
*vk_pool = alloc_info.descriptorPool;
break;
}
}
if (vr == VK_ERROR_OUT_OF_POOL_MEMORY || vr == VK_ERROR_FRAGMENTED_POOL)
{
vr = vkd3d_sampler_state_create_descriptor_pool(device, &alloc_info.descriptorPool);
if (vr != VK_SUCCESS)
{
pthread_mutex_unlock(&state->mutex);
return hresult_from_vk_result(vr);
}
if (!vkd3d_array_reserve((void **)&state->vk_descriptor_pools, &state->vk_descriptor_pools_size,
state->vk_descriptor_pool_count + 1, sizeof(*state->vk_descriptor_pools)))
{
VK_CALL(vkDestroyDescriptorPool(device->vk_device, alloc_info.descriptorPool, NULL));
pthread_mutex_unlock(&state->mutex);
return E_OUTOFMEMORY;
}
state->vk_descriptor_pools[state->vk_descriptor_pool_count++] = alloc_info.descriptorPool;
vr = VK_CALL(vkAllocateDescriptorSets(device->vk_device, &alloc_info, vk_set));
*vk_pool = alloc_info.descriptorPool;
}
pthread_mutex_unlock(&state->mutex);
return hresult_from_vk_result(vr);
}
void vkd3d_sampler_state_free_descriptor_set(struct vkd3d_sampler_state *state,
struct d3d12_device *device, VkDescriptorSet vk_set, VkDescriptorPool vk_pool)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
int rc;
if ((rc = pthread_mutex_lock(&state->mutex)))
ERR("Failed to lock mutex, rc %d.\n", rc);
VK_CALL(vkFreeDescriptorSets(device->vk_device, vk_pool, 1, &vk_set));
pthread_mutex_unlock(&state->mutex);
}
static void d3d12_resource_get_tiling(struct d3d12_device *device, struct d3d12_resource *resource,
UINT *total_tile_count, D3D12_PACKED_MIP_INFO *packed_mip_info, D3D12_TILE_SHAPE *tile_shape,
D3D12_SUBRESOURCE_TILING *tilings, VkSparseImageMemoryRequirements *vk_info)

9
libs/vkd3d/vkd3d_private.h
View File

@ -1450,6 +1450,10 @@ struct vkd3d_sampler_state
{
pthread_mutex_t mutex;
struct hash_map map;
VkDescriptorPool *vk_descriptor_pools;
size_t vk_descriptor_pools_size;
size_t vk_descriptor_pool_count;
};
HRESULT vkd3d_sampler_state_init(struct vkd3d_sampler_state *state,
@ -1458,6 +1462,11 @@ void vkd3d_sampler_state_cleanup(struct vkd3d_sampler_state *state,
struct d3d12_device *device) DECLSPEC_HIDDEN;
HRESULT vkd3d_sampler_state_create_static_sampler(struct vkd3d_sampler_state *state,
struct d3d12_device *device, const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler) DECLSPEC_HIDDEN;
HRESULT vkd3d_sampler_state_allocate_descriptor_set(struct vkd3d_sampler_state *state,
struct d3d12_device *device, VkDescriptorSetLayout vk_layout, VkDescriptorSet *vk_set,
VkDescriptorPool *vk_pool) DECLSPEC_HIDDEN;
void vkd3d_sampler_state_free_descriptor_set(struct vkd3d_sampler_state *state,
struct d3d12_device *device, VkDescriptorSet vk_set, VkDescriptorPool vk_pool) DECLSPEC_HIDDEN;
/* NULL resources */
struct vkd3d_null_resources