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: Use vk_binding_array_add_binding() in d3d12_root_signature_init_root_descriptors().

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-25 14:55:18 +02:00 committed by Henri Verbeet
parent 3aec841a9f
commit b5c56a50b5
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 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/vkd3d/state.c
View File

@ -1288,8 +1288,7 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign
const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context)
{ {
struct vk_binding_array *vk_bindings = &context->vk_bindings; struct vk_binding_array *vk_bindings = &context->vk_bindings;
VkDescriptorSetLayoutBinding *cur_binding; unsigned int binding_idx, i;
unsigned int i;
HRESULT hr; HRESULT hr;
root_signature->push_descriptor_mask = 0; root_signature->push_descriptor_mask = 0;
@ -1304,21 +1303,17 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign
root_signature->push_descriptor_mask |= 1u << i; root_signature->push_descriptor_mask |= 1u << i;
cur_binding = &vk_bindings->bindings[vk_bindings->count];
if (FAILED(hr = d3d12_root_signature_assign_vk_bindings(root_signature, if (FAILED(hr = d3d12_root_signature_assign_vk_bindings(root_signature,
vkd3d_descriptor_type_from_d3d12_root_parameter_type(p->ParameterType), vkd3d_descriptor_type_from_d3d12_root_parameter_type(p->ParameterType),
p->u.Descriptor.RegisterSpace, p->u.Descriptor.ShaderRegister, 1, true, false, p->u.Descriptor.RegisterSpace, p->u.Descriptor.ShaderRegister, 1, true, false,
vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context, &cur_binding->binding))) vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context, &binding_idx)))
return hr; return hr;
cur_binding->descriptorType = vk_descriptor_type_from_d3d12_root_parameter(p->ParameterType); vk_binding_array_add_binding(vk_bindings, binding_idx,
cur_binding->descriptorCount = 1; vk_descriptor_type_from_d3d12_root_parameter(p->ParameterType),
cur_binding->stageFlags = stage_flags_from_visibility(p->ShaderVisibility); 1, stage_flags_from_visibility(p->ShaderVisibility), NULL);
cur_binding->pImmutableSamplers = NULL;
root_signature->parameters[i].parameter_type = p->ParameterType; root_signature->parameters[i].parameter_type = p->ParameterType;
root_signature->parameters[i].u.descriptor.binding = cur_binding->binding; root_signature->parameters[i].u.descriptor.binding = binding_idx;
++vk_bindings->count;
} }
return S_OK; return S_OK;