wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Rename push_descriptor_set to root_descriptor_set.

Browse Source 
Soon it won't be used necessarily for push descriptors anymore, but
it will still contain root descriptors.
This commit is contained in:
Giovanni Mascellani
2025-02-12 19:17:19 +01:00
committed by Henri Verbeet
parent 67d8cf744c
commit 6415c6b0e0
Notes: Henri Verbeet 2025-02-19 18:03:19 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1376
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/vkd3d/state.c
View File

@@ -754,7 +754,7 @@ struct vkd3d_descriptor_set_context
unsigned int uav_counter_index; unsigned int uav_counter_index;
unsigned int push_constant_index; unsigned int push_constant_index;
struct vk_binding_array *push_descriptor_set; struct vk_binding_array *root_descriptor_set;
bool push_descriptor; bool push_descriptor;
}; };
@@ -808,11 +808,11 @@ static struct vk_binding_array *d3d12_root_signature_vk_binding_array_for_type(
if (context->push_descriptor) if (context->push_descriptor)
{ {
if (!context->push_descriptor_set) if (!context->root_descriptor_set)
context->push_descriptor_set = d3d12_root_signature_append_vk_binding_array(root_signature, context->root_descriptor_set = d3d12_root_signature_append_vk_binding_array(root_signature,
descriptor_type, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR, context); descriptor_type, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR, context);
return context->push_descriptor_set; return context->root_descriptor_set;
} }
current = context->current_binding_array; current = context->current_binding_array;
@@ -1641,7 +1641,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
context.push_descriptor = vk_info->KHR_push_descriptor; context.push_descriptor = vk_info->KHR_push_descriptor;
if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context))) if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context)))
goto fail; goto fail;
root_signature->main_set = !!context.push_descriptor_set; root_signature->main_set = !!context.root_descriptor_set;
context.push_descriptor = false; context.push_descriptor = false;
if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc,