wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Move vkd3d_vk_descriptor_set_index_from_vk_descriptor_type() to resource.c.

Browse Source 
It's only used there.
This commit is contained in:
Giovanni Mascellani
2025-07-03 15:45:41 +02:00
committed by Henri Verbeet
parent fc77bddb9c
commit fb91bd7b8b
Notes: Henri Verbeet 2025-07-14 18:54:27 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1616
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/vkd3d/resource.c
View File

@@ -2492,6 +2492,26 @@ static void descriptor_writes_free_object_refs(struct descriptor_writes *writes,
writes->held_ref_count = 0; writes->held_ref_count = 0;
} }
static enum vkd3d_vk_descriptor_set_index vkd3d_vk_descriptor_set_index_from_vk_descriptor_type(
VkDescriptorType type)
{
static const enum vkd3d_vk_descriptor_set_index table[] =
{
[VK_DESCRIPTOR_TYPE_SAMPLER] = VKD3D_SET_INDEX_SAMPLER,
[VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER] = VKD3D_SET_INDEX_COUNT,
[VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE] = VKD3D_SET_INDEX_SAMPLED_IMAGE,
[VK_DESCRIPTOR_TYPE_STORAGE_IMAGE] = VKD3D_SET_INDEX_STORAGE_IMAGE,
[VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER] = VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER,
[VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER] = VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER,
[VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER] = VKD3D_SET_INDEX_UNIFORM_BUFFER,
};
VKD3D_ASSERT(type < ARRAY_SIZE(table));
VKD3D_ASSERT(table[type] < VKD3D_SET_INDEX_COUNT);
return table[type];
}
static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_heap *descriptor_heap, static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_heap *descriptor_heap,
uint32_t dst_array_element, struct descriptor_writes *writes, struct d3d12_device *device) uint32_t dst_array_element, struct descriptor_writes *writes, struct d3d12_device *device)
{ {
@@ -4224,17 +4244,6 @@ static const struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl =
d3d12_descriptor_heap_GetGPUDescriptorHandleForHeapStart, d3d12_descriptor_heap_GetGPUDescriptorHandleForHeapStart,
}; };
const enum vkd3d_vk_descriptor_set_index vk_descriptor_set_index_table[] =
{
VKD3D_SET_INDEX_SAMPLER,
VKD3D_SET_INDEX_COUNT,
VKD3D_SET_INDEX_SAMPLED_IMAGE,
VKD3D_SET_INDEX_STORAGE_IMAGE,
VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER,
VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER,
VKD3D_SET_INDEX_UNIFORM_BUFFER,
};
static HRESULT d3d12_descriptor_heap_create_descriptor_pool(struct d3d12_descriptor_heap *descriptor_heap, static HRESULT d3d12_descriptor_heap_create_descriptor_pool(struct d3d12_descriptor_heap *descriptor_heap,
struct d3d12_device *device, const D3D12_DESCRIPTOR_HEAP_DESC *desc) struct d3d12_device *device, const D3D12_DESCRIPTOR_HEAP_DESC *desc)
{ {

11
libs/vkd3d/vkd3d_private.h
View File

@@ -827,17 +827,6 @@ enum vkd3d_vk_descriptor_set_index
VKD3D_SET_INDEX_COUNT VKD3D_SET_INDEX_COUNT
}; };
extern const enum vkd3d_vk_descriptor_set_index vk_descriptor_set_index_table[];
static inline enum vkd3d_vk_descriptor_set_index vkd3d_vk_descriptor_set_index_from_vk_descriptor_type(
VkDescriptorType type)
{
VKD3D_ASSERT(type <= VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
VKD3D_ASSERT(vk_descriptor_set_index_table[type] < VKD3D_SET_INDEX_COUNT);
return vk_descriptor_set_index_table[type];
}
struct vkd3d_vk_descriptor_heap_layout struct vkd3d_vk_descriptor_heap_layout
{ {
VkDescriptorType type; VkDescriptorType type;