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

vkd3d: Move duplicate descriptor accounting to the descriptor count function.

Browse Source 
Count variables no longer (or never) used are deleted.

Signed-off-by: Conor McCarthy <cmccarthy@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2021-04-17 01:01:39 +10:00 committed by Alexandre Julliard
parent 59419c6bde
commit 9bc1d0f6a3
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/vkd3d/state.c
View File

@ -316,13 +316,6 @@ static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutB
struct d3d12_root_signature_info struct d3d12_root_signature_info
{ {
size_t cbv_count;
size_t buffer_uav_count;
size_t uav_count;
size_t buffer_srv_count;
size_t srv_count;
size_t sampler_count;
size_t binding_count; size_t binding_count;
size_t root_constant_count; size_t root_constant_count;
@ -343,16 +336,19 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig
switch (range->RangeType) switch (range->RangeType)
{ {
case D3D12_DESCRIPTOR_RANGE_TYPE_SRV: case D3D12_DESCRIPTOR_RANGE_TYPE_SRV:
info->srv_count += range->NumDescriptors; /* XXX: Vulkan buffer and image descriptors have different types. In order
* to preserve compatibility between Vulkan resource bindings for the same
* root signature, we create descriptor set layouts with two bindings for
* each SRV and UAV. */
info->binding_count += range->NumDescriptors;
break; break;
case D3D12_DESCRIPTOR_RANGE_TYPE_UAV: case D3D12_DESCRIPTOR_RANGE_TYPE_UAV:
info->uav_count += range->NumDescriptors; /* As above. */
info->binding_count += range->NumDescriptors;
break; break;
case D3D12_DESCRIPTOR_RANGE_TYPE_CBV: case D3D12_DESCRIPTOR_RANGE_TYPE_CBV:
info->cbv_count += range->NumDescriptors;
break; break;
case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER: case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER:
info->sampler_count += range->NumDescriptors;
break; break;
default: default:
FIXME("Unhandled descriptor type %#x.\n", range->RangeType); FIXME("Unhandled descriptor type %#x.\n", range->RangeType);
@ -388,19 +384,16 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i
case D3D12_ROOT_PARAMETER_TYPE_CBV: case D3D12_ROOT_PARAMETER_TYPE_CBV:
++info->root_descriptor_count; ++info->root_descriptor_count;
++info->cbv_count;
++info->binding_count; ++info->binding_count;
info->cost += 2; info->cost += 2;
break; break;
case D3D12_ROOT_PARAMETER_TYPE_SRV: case D3D12_ROOT_PARAMETER_TYPE_SRV:
++info->root_descriptor_count; ++info->root_descriptor_count;
++info->buffer_srv_count;
++info->binding_count; ++info->binding_count;
info->cost += 2; info->cost += 2;
break; break;
case D3D12_ROOT_PARAMETER_TYPE_UAV: case D3D12_ROOT_PARAMETER_TYPE_UAV:
++info->root_descriptor_count; ++info->root_descriptor_count;
++info->buffer_uav_count;
++info->binding_count; ++info->binding_count;
info->cost += 2; info->cost += 2;
break; break;
@ -416,7 +409,6 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i
} }
} }
info->sampler_count += desc->NumStaticSamplers;
info->binding_count += desc->NumStaticSamplers; info->binding_count += desc->NumStaticSamplers;
return S_OK; return S_OK;
@ -809,12 +801,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
return E_INVALIDARG; return E_INVALIDARG;
} }
/* XXX: Vulkan buffer and image descriptors have different types. In order
* to preserve compatibility between Vulkan resource bindings for the same
* root signature, we create descriptor set layouts with two bindings for
* each SRV and UAV. */
info.binding_count += info.srv_count + info.uav_count;
root_signature->binding_count = info.binding_count; root_signature->binding_count = info.binding_count;
root_signature->static_sampler_count = desc->NumStaticSamplers; root_signature->static_sampler_count = desc->NumStaticSamplers;
root_signature->root_descriptor_count = info.root_descriptor_count; root_signature->root_descriptor_count = info.root_descriptor_count;