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: Implement creating compute pipeline states from shaders with embedded root signatures.

Browse Source
This commit is contained in:
Henri Verbeet 2023-09-05 15:39:06 +02:00 committed by Alexandre Julliard
parent 18986ddb50
commit 7d6f0f2592
Notes: Alexandre Julliard 2024-04-15 22:23:48 +02:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/790
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/vkd3d/state.c
View File

@ -2045,6 +2045,9 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState
d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device);
if (state->implicit_root_signature)
d3d12_root_signature_Release(state->implicit_root_signature);
vkd3d_free(state); vkd3d_free(state);
d3d12_device_release(device); d3d12_device_release(device);
@ -2413,8 +2416,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
struct vkd3d_shader_interface_info shader_interface; struct vkd3d_shader_interface_info shader_interface;
struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_descriptor_offset_info offset_info;
const struct d3d12_root_signature *root_signature;
struct vkd3d_shader_spirv_target_info target_info; struct vkd3d_shader_spirv_target_info target_info;
struct d3d12_root_signature *root_signature;
VkPipelineLayout vk_pipeline_layout; VkPipelineLayout vk_pipeline_layout;
HRESULT hr; HRESULT hr;
@ -2425,13 +2428,27 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st
if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->root_signature))) if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->root_signature)))
{ {
WARN("Root signature is NULL.\n"); TRACE("Root signature is NULL, looking for an embedded signature.\n");
return E_INVALIDARG; if (FAILED(hr = d3d12_root_signature_create(device,
desc->cs.pShaderBytecode, desc->cs.BytecodeLength, &root_signature)))
{
WARN("Failed to find an embedded root signature, hr %s.\n", debugstr_hresult(hr));
return hr;
}
state->implicit_root_signature = &root_signature->ID3D12RootSignature_iface;
}
else
{
state->implicit_root_signature = NULL;
} }
if (FAILED(hr = d3d12_pipeline_state_find_and_init_uav_counters(state, device, root_signature, if (FAILED(hr = d3d12_pipeline_state_find_and_init_uav_counters(state, device, root_signature,
&desc->cs, VK_SHADER_STAGE_COMPUTE_BIT))) &desc->cs, VK_SHADER_STAGE_COMPUTE_BIT)))
{
if (state->implicit_root_signature)
d3d12_root_signature_Release(state->implicit_root_signature);
return hr; return hr;
}
memset(&target_info, 0, sizeof(target_info)); memset(&target_info, 0, sizeof(target_info));
target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO;
@ -2476,6 +2493,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st
{ {
WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr)); WARN("Failed to create Vulkan compute pipeline, hr %s.\n", debugstr_hresult(hr));
d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device);
if (state->implicit_root_signature)
d3d12_root_signature_Release(state->implicit_root_signature);
return hr; return hr;
} }
@ -2483,6 +2502,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st
{ {
VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL));
d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device);
if (state->implicit_root_signature)
d3d12_root_signature_Release(state->implicit_root_signature);
return hr; return hr;
} }
@ -3484,6 +3505,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
goto fail; goto fail;
state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS;
state->implicit_root_signature = NULL;
d3d12_device_add_ref(state->device = device); d3d12_device_add_ref(state->device = device);
return S_OK; return S_OK;

1
libs/vkd3d/vkd3d_private.h
View File

@ -1213,6 +1213,7 @@ struct d3d12_pipeline_state
struct d3d12_pipeline_uav_counter_state uav_counters; struct d3d12_pipeline_uav_counter_state uav_counters;
ID3D12RootSignature *implicit_root_signature;
struct d3d12_device *device; struct d3d12_device *device;
struct vkd3d_private_store private_store; struct vkd3d_private_store private_store;

5
tests/d3d12.c
View File

@ -3135,9 +3135,8 @@ static void test_create_compute_pipeline_state(void)
pipeline_state_desc.CS = shader_bytecode(cs_with_rs, sizeof(cs_with_rs)); pipeline_state_desc.CS = shader_bytecode(cs_with_rs, sizeof(cs_with_rs));
hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc,
&IID_ID3D12PipelineState, (void **)&pipeline_state); &IID_ID3D12PipelineState, (void **)&pipeline_state);
todo ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
if (SUCCEEDED(hr)) ID3D12PipelineState_Release(pipeline_state);
ID3D12PipelineState_Release(pipeline_state);
refcount = ID3D12Device_Release(device); refcount = ID3D12Device_Release(device);
ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount);