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

libs/vkd3d: Implement d3d12_command_list_SetComputeRootSignature().

Browse Source
This commit is contained in:
Józef Kucia
2017-07-25 12:50:14 +02:00
parent 3f4ef37b88
commit 73cdf0164a
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libs/vkd3d/command.c
View File

@ -1419,7 +1419,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL
list->pipeline_state = initial_state; list->pipeline_state = initial_state;
} }
list->root_signature = NULL; list->graphics_root_signature = NULL;
list->compute_root_signature = NULL;
return hr; return hr;
} }
@ -1609,7 +1610,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list
static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list, static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list,
const struct vkd3d_vk_device_procs *vk_procs) const struct vkd3d_vk_device_procs *vk_procs)
{ {
struct d3d12_root_signature *rs = list->root_signature; struct d3d12_root_signature *rs = list->graphics_root_signature;
struct VkRenderPassBeginInfo begin_desc; struct VkRenderPassBeginInfo begin_desc;
if (!list->state) if (!list->state)
@ -2214,7 +2215,18 @@ static VkDescriptorSet d3d12_command_list_allocate_descriptor_set(struct d3d12_c
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList *iface, static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList *iface,
ID3D12RootSignature *root_signature) ID3D12RootSignature *root_signature)
{ {
FIXME("iface %p, root_signature %p stub!\n", iface, root_signature); struct d3d12_root_signature *rs = unsafe_impl_from_ID3D12RootSignature(root_signature);
struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface);
TRACE("iface %p, root_signature %p.\n", iface, root_signature);
if (list->compute_root_signature == rs)
return;
if (!(list->compute_descriptor_set = d3d12_command_list_allocate_descriptor_set(list, rs)))
return;
list->compute_root_signature = rs;
} }
static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList *iface, static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12GraphicsCommandList *iface,
@ -2225,13 +2237,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetGraphicsRootSignature(ID3D12
TRACE("iface %p, root_signature %p.\n", iface, root_signature); TRACE("iface %p, root_signature %p.\n", iface, root_signature);
if (list->root_signature == rs) if (list->graphics_root_signature == rs)
return; return;
if (!(list->graphics_descriptor_set = d3d12_command_list_allocate_descriptor_set(list, rs))) if (!(list->graphics_descriptor_set = d3d12_command_list_allocate_descriptor_set(list, rs)))
return; return;
list->root_signature = rs; list->graphics_root_signature = rs;
} }
static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface, static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootDescriptorTable(ID3D12GraphicsCommandList *iface,
@ -2854,9 +2866,11 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d
list->current_framebuffer = VK_NULL_HANDLE; list->current_framebuffer = VK_NULL_HANDLE;
list->current_pipeline = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE;
list->graphics_descriptor_set = VK_NULL_HANDLE; list->graphics_descriptor_set = VK_NULL_HANDLE;
list->compute_descriptor_set = VK_NULL_HANDLE;
list->state = NULL; list->state = NULL;
list->root_signature = NULL; list->graphics_root_signature = NULL;
list->compute_root_signature = NULL;
return S_OK; return S_OK;
} }

4
libs/vkd3d/vkd3d_private.h
View File

@ -350,9 +350,11 @@ struct d3d12_command_list
VkFramebuffer current_framebuffer; VkFramebuffer current_framebuffer;
VkPipeline current_pipeline; VkPipeline current_pipeline;
VkDescriptorSet graphics_descriptor_set; VkDescriptorSet graphics_descriptor_set;
VkDescriptorSet compute_descriptor_set;
struct d3d12_pipeline_state *state; struct d3d12_pipeline_state *state;
struct d3d12_root_signature *root_signature; struct d3d12_root_signature *graphics_root_signature;
struct d3d12_root_signature *compute_root_signature;
struct d3d12_command_allocator *allocator; struct d3d12_command_allocator *allocator;
struct d3d12_device *device; struct d3d12_device *device;