wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Introduce a helper function to add bindings to struct vk_binding_array.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-25 15:32:21 +02:00 committed by Henri Verbeet
parent eca344ff56
commit 416ce575f6
Notes: Henri Verbeet 2024-10-17 17:39:00 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1070
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libs/vkd3d/state.c
View File

@ -313,20 +313,6 @@ static enum vkd3d_shader_descriptor_type vkd3d_descriptor_type_from_d3d12_root_p
} }
} }
static bool vk_binding_from_d3d12_descriptor_range(struct VkDescriptorSetLayoutBinding *binding_desc,
enum vkd3d_shader_descriptor_type descriptor_type, D3D12_SHADER_VISIBILITY shader_visibility,
bool is_buffer, uint32_t vk_binding, unsigned int descriptor_count)
{
binding_desc->binding = vk_binding;
binding_desc->descriptorType
= vk_descriptor_type_from_vkd3d_descriptor_type(descriptor_type, is_buffer);
binding_desc->descriptorCount = descriptor_count;
binding_desc->stageFlags = stage_flags_from_visibility(shader_visibility);
binding_desc->pImmutableSamplers = NULL;
return true;
}
struct d3d12_root_signature_info struct d3d12_root_signature_info
{ {
size_t binding_count; size_t binding_count;
@ -738,6 +724,19 @@ static bool vk_binding_array_init(struct vk_binding_array *array, size_t capacit
return true; return true;
} }
static void vk_binding_array_add_binding(struct vk_binding_array *array, unsigned int binding_idx,
VkDescriptorType descriptor_type, unsigned int descriptor_count, VkShaderStageFlags stage_flags)
{
VkDescriptorSetLayoutBinding *binding;
binding = &array->bindings[array->count++];
binding->binding = binding_idx;
binding->descriptorType = descriptor_type;
binding->descriptorCount = descriptor_count;
binding->stageFlags = stage_flags;
binding->pImmutableSamplers = NULL;
}
struct vkd3d_descriptor_set_context struct vkd3d_descriptor_set_context
{ {
struct vk_binding_array vk_bindings; struct vk_binding_array vk_bindings;
@ -928,21 +927,17 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r
if (descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) if (descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
{ {
if (!vk_binding_from_d3d12_descriptor_range(&vk_bindings->bindings[vk_bindings->count], vk_binding_array_add_binding(vk_bindings, context->descriptor_binding,
descriptor_type, visibility, true, context->descriptor_binding, range->vk_binding_count)) vk_descriptor_type_from_vkd3d_descriptor_type(descriptor_type, true),
return E_NOTIMPL; range->vk_binding_count, stage_flags_from_visibility(visibility));
++vk_bindings->count;
if (FAILED(hr = d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, range->register_space, if (FAILED(hr = d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, range->register_space,
range->base_register_idx, true, shader_visibility, range->vk_binding_count, context))) range->base_register_idx, true, shader_visibility, range->vk_binding_count, context)))
return hr; return hr;
} }
if (!vk_binding_from_d3d12_descriptor_range(&vk_bindings->bindings[vk_bindings->count], vk_binding_array_add_binding(vk_bindings, context->descriptor_binding,
descriptor_type, visibility, is_buffer, context->descriptor_binding, range->vk_binding_count)) vk_descriptor_type_from_vkd3d_descriptor_type(descriptor_type, is_buffer),
return E_NOTIMPL; range->vk_binding_count, stage_flags_from_visibility(visibility));
++vk_bindings->count;
if (FAILED(hr = d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, range->register_space, if (FAILED(hr = d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, range->register_space,
range->base_register_idx, is_buffer, shader_visibility, range->vk_binding_count, context))) range->base_register_idx, is_buffer, shader_visibility, range->vk_binding_count, context)))
return hr; return hr;
@ -1269,16 +1264,14 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo
vk_current_binding = vk_binding + 2 * k; vk_current_binding = vk_binding + 2 * k;
/* Assign binding for image view. */ /* Assign binding for image view. */
if (!vk_binding_from_d3d12_descriptor_range(&vk_bindings->bindings[vk_bindings->count], vk_binding_array_add_binding(vk_bindings, vk_current_binding + 1,
range->type, p->ShaderVisibility, false, vk_current_binding + 1, 1)) vk_descriptor_type_from_vkd3d_descriptor_type(range->type, false),
return E_NOTIMPL; 1, stage_flags_from_visibility(p->ShaderVisibility));
++vk_bindings->count;
} }
if (!vk_binding_from_d3d12_descriptor_range(&vk_bindings->bindings[vk_bindings->count], vk_binding_array_add_binding(vk_bindings, vk_current_binding,
range->type, p->ShaderVisibility, true, vk_current_binding, 1)) vk_descriptor_type_from_vkd3d_descriptor_type(range->type, true),
return E_NOTIMPL; 1, stage_flags_from_visibility(p->ShaderVisibility));
++vk_bindings->count;
} }
range->vk_binding_count = range->descriptor_count; range->vk_binding_count = range->descriptor_count;