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

libs/vkd3d: Add support for CBV descriptors in d3d12_command_list_set_descriptor_table().

Browse Source
This commit is contained in:
Józef Kucia 2017-08-04 17:06:33 +02:00
parent 0859b94833
commit db3a112fb5
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d/command.c
View File

@ -2270,7 +2270,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12
static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *list, static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *list,
VkDescriptorSet descriptor_set, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) VkDescriptorSet descriptor_set, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor)
{ {
const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct d3d12_device *device = list->device;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
struct VkWriteDescriptorSet descriptor_write; struct VkWriteDescriptorSet descriptor_write;
struct d3d12_cbv_srv_uav_desc *descriptor; struct d3d12_cbv_srv_uav_desc *descriptor;
struct VkDescriptorImageInfo image_info; struct VkDescriptorImageInfo image_info;
@ -2289,7 +2290,11 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l
descriptor_write.pBufferInfo = NULL; descriptor_write.pBufferInfo = NULL;
descriptor_write.pTexelBufferView = NULL; descriptor_write.pTexelBufferView = NULL;
if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV) if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_CBV)
{
descriptor_write.pBufferInfo = &descriptor->u.vk_cbv_info;
}
else if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_SRV)
{ {
image_info.sampler = VK_NULL_HANDLE; image_info.sampler = VK_NULL_HANDLE;
image_info.imageView = descriptor->u.vk_image_view; image_info.imageView = descriptor->u.vk_image_view;
@ -2308,10 +2313,18 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l
image_info.sampler = VK_NULL_HANDLE; image_info.sampler = VK_NULL_HANDLE;
image_info.imageView = descriptor->u.vk_image_view; image_info.imageView = descriptor->u.vk_image_view;
image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
descriptor_write.pImageInfo = &image_info;
} }
} }
else
{
if (descriptor->magic)
FIXME("Unhandled descriptor %#x.\n", descriptor->magic);
return;
}
VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL)); VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, &descriptor_write, 0, NULL));
} }
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface, static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface,