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

vkd3d: Create separate descriptor set layout for host-only pools. 

D3D12 allows much larger pools to be created for heaps that are not
shader-visible, which some games make use of. Fixes crashes on Nvidia.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-08-07 18:14:33 +02:00 committed by Hans-Kristian Arntzen
parent 68fc3f9322
commit a056922293
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/vkd3d/resource.c
View File

@ -4634,7 +4634,10 @@ static HRESULT d3d12_descriptor_heap_create_descriptor_set(struct d3d12_descript
vk_set_info.pNext = &vk_variable_count_info;
vk_set_info.descriptorPool = descriptor_heap->vk_descriptor_pool;
vk_set_info.descriptorSetCount = 1;
vk_set_info.pSetLayouts = &binding->vk_set_layout;
vk_set_info.pSetLayouts = &binding->vk_host_set_layout;
if (descriptor_heap->desc.Flags & D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE)
vk_set_info.pSetLayouts = &binding->vk_set_layout;
if ((vr = VK_CALL(vkAllocateDescriptorSets(device->vk_device, &vk_set_info, vk_descriptor_set))) < 0)
{

33
libs/vkd3d/state.c
View File

@ -3015,6 +3015,30 @@ static uint32_t d3d12_max_descriptor_count_from_range_type(D3D12_DESCRIPTOR_RANG
}
}
static uint32_t d3d12_max_host_descriptor_count_from_range_type(struct d3d12_device *device, D3D12_DESCRIPTOR_RANGE_TYPE range_type)
{
const VkPhysicalDeviceDescriptorIndexingPropertiesEXT *limits = &device->device_info.descriptor_indexing_properties;
switch (range_type)
{
case D3D12_DESCRIPTOR_RANGE_TYPE_CBV:
return device->bindless_state.flags & VKD3D_BINDLESS_CBV_AS_SSBO
? limits->maxDescriptorSetUpdateAfterBindStorageBuffers
: limits->maxDescriptorSetUpdateAfterBindUniformBuffers;
case D3D12_DESCRIPTOR_RANGE_TYPE_SRV:
return limits->maxDescriptorSetUpdateAfterBindSampledImages;
case D3D12_DESCRIPTOR_RANGE_TYPE_UAV:
return min(limits->maxDescriptorSetUpdateAfterBindStorageBuffers,
limits->maxDescriptorSetUpdateAfterBindStorageImages);
case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER:
return limits->maxDescriptorSetUpdateAfterBindSamplers;
default:
ERR("Invalid descriptor range type %d.\n", range_type);
return 0;
}
}
static HRESULT vkd3d_bindless_state_add_binding(struct vkd3d_bindless_state *bindless_state,
struct d3d12_device *device, D3D12_DESCRIPTOR_RANGE_TYPE range_type,
enum vkd3d_shader_binding_flag binding_flag)
@ -3059,6 +3083,12 @@ static HRESULT vkd3d_bindless_state_add_binding(struct vkd3d_bindless_state *bin
&vk_set_layout_info, NULL, &set_info->vk_set_layout))) < 0)
ERR("Failed to create descriptor set layout, vr %d.\n", vr);
vk_binding_info.descriptorCount = d3d12_max_host_descriptor_count_from_range_type(device, range_type);
if ((vr = VK_CALL(vkCreateDescriptorSetLayout(device->vk_device,
&vk_set_layout_info, NULL, &set_info->vk_host_set_layout))) < 0)
ERR("Failed to create descriptor set layout, vr %d.\n", vr);
return hresult_from_vk_result(vr);
}
@ -3166,7 +3196,10 @@ void vkd3d_bindless_state_cleanup(struct vkd3d_bindless_state *bindless_state,
unsigned int i;
for (i = 0; i < bindless_state->set_count; i++)
{
VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, bindless_state->set_info[i].vk_set_layout, NULL));
VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, bindless_state->set_info[i].vk_host_set_layout, NULL));
}
}
bool vkd3d_bindless_state_find_binding(const struct vkd3d_bindless_state *bindless_state,

1
libs/vkd3d/vkd3d_private.h
View File

@ -1465,6 +1465,7 @@ struct vkd3d_bindless_set_info
enum vkd3d_shader_binding_flag binding_flag;
VkDescriptorSetLayout vk_set_layout;
VkDescriptorSetLayout vk_host_set_layout;
};
struct vkd3d_bindless_state