wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Overallocate descriptors for SRV and UAV descriptor ranges.

Browse Source
This commit is contained in:
Józef Kucia 2017-08-08 17:09:35 +02:00
parent 3eb5e59e37
commit 1b02322c1d
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d/state.c
View File

@ -719,12 +719,14 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
root_signature->pool_size_count = 0;
if (info.cbv_count)
++root_signature->pool_size_count;
if (info.buffer_srv_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)
@ -742,21 +744,32 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
root_signature->pool_sizes[i++].descriptorCount = info.cbv_count;
}
if (info.buffer_srv_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;
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;