February 2022 - Wine-Commits

Zebediah Figura : winegstreamer: Use IMemAllocator::GetBuffer() directly.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 8c7ad5fc397e4814c33fa4b85be505db94d70016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7ad5fc397e4814c33fa4b8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:39 2022 -0600 winegstreamer: Use IMemAllocator::GetBuffer() directly. BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here. Note that we cannot be unconnected at this point, or stream_thread() would not even be running. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 331bc9a888a..45313ebda27 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -753,12 +753,9 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event { uint32_t advance; - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (FAILED(hr)) + if (FAILED(hr = IMemAllocator_GetBuffer(pin->pin.pAllocator, &sample, NULL, NULL, 0))) { - if (hr != VFW_E_NOT_CONNECTED) - ERR("Failed to get a sample, hr %#lx.\n", hr); + ERR("Failed to get a sample, hr %#lx.\n", hr); break; } @@ -776,12 +773,9 @@ static void send_buffer(struct parser_source *pin, const struct wg_parser_event } else { - hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - - if (FAILED(hr)) + if (FAILED(hr = IMemAllocator_GetBuffer(pin->pin.pAllocator, &sample, NULL, NULL, 0))) { - if (hr != VFW_E_NOT_CONNECTED) - ERR("Failed to get a sample, hr %#lx.\n", hr); + ERR("Failed to get a sample, hr %#lx.\n", hr); } else {

1 0

Alistair Leslie-Hughes : xactengine3_7/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 111c87f444b167f56633462f778d9f5aa6ef53ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=111c87f444b167f56633462f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 6 13:47:16 2022 +1100 xactengine3_7/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/tests/Makefile.in | 1 - dlls/xactengine3_7/tests/xact3.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in index 693c3687728..c32b2562546 100644 --- a/dlls/xactengine3_7/tests/Makefile.in +++ b/dlls/xactengine3_7/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xactengine3_7.dll IMPORTS = ole32 diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 6b04c36a9f0..623a1c97db8 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -84,7 +84,7 @@ static void test_interfaces(void) trace("%d %s not registered. Skipping\n", i, wine_dbgstr_guid(xact_interfaces[i].clsid) ); continue; } - ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08x\n", i, hr); + ok(hr == xact_interfaces[i].expected, "%d, Unexpected value 0x%08lx\n", i, hr); if (hr == S_OK) IUnknown_Release(unk); }

1 0

Zebediah Figura : amstream/tests: Use IMemAllocator::GetBuffer() directly.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 2552a4843646e8a842bbbf728389862a6b2027c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2552a4843646e8a842bbbf72… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:40 2022 -0600 amstream/tests: Use IMemAllocator::GetBuffer() directly. BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index d27bf801482..5b3e78e0583 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4256,7 +4256,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4272,7 +4272,7 @@ static void test_audiostream_begin_flush_end_flush(void) ref = IMediaSample_Release(media_sample); ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -4289,7 +4289,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4408,7 +4408,7 @@ static IMediaSample *ammediastream_allocate_sample(struct testfilter *source, co BYTE *sample_data; HRESULT hr; - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source->source, &sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source->source.pAllocator, &sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaSample_GetPointer(sample, &sample_data); @@ -5848,7 +5848,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); ammediastream_mem_input_pin = source.source.pMemInputPin; @@ -5866,7 +5866,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) ref = IMediaSample_Release(media_sample); ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -5883,7 +5883,7 @@ static void test_ddrawstream_begin_flush_end_flush(void) hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + hr = IMemAllocator_GetBuffer(source.source.pAllocator, &media_sample, NULL, NULL, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap/vfwcapture: Allow changing state while unconnected.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 859809be485247d15ef63b4fcc97d5868020ebc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859809be485247d15ef63b4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:41 2022 -0600 qcap/vfwcapture: Allow changing state while unconnected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 53 ++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/vfwcapture.c | 18 +++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index c44070b0bd5..4e9dca7d837 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -296,6 +296,58 @@ static void test_misc_flags(IBaseFilter *filter) IAMFilterMiscFlags_Release(misc_flags); } +static void test_unconnected_filter_state(IBaseFilter *filter) +{ + FILTER_STATE state; + HRESULT hr; + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Pause(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); + + hr = IBaseFilter_Run(filter, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Running, "Got state %u.\n", state); + + hr = IBaseFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_GetState(filter, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Stopped, "Got state %u.\n", state); +} + struct testfilter { struct strmbase_filter filter; @@ -615,6 +667,7 @@ START_TEST(videocapture) test_filter_interfaces(filter); test_pins(filter); test_misc_flags(filter); + test_unconnected_filter_state(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6b82af9d155..7e6b0ee5afe 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -199,6 +199,9 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) struct vfw_capture *filter = impl_from_strmbase_filter(iface); HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); @@ -215,6 +218,9 @@ static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE { struct vfw_capture *filter = impl_from_strmbase_filter(iface); + if (!filter->source.pin.peer) + return S_OK; + EnterCriticalSection(&filter->state_cs); filter->state = State_Running; LeaveCriticalSection(&filter->state_cs); @@ -226,6 +232,9 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface) { struct vfw_capture *filter = impl_from_strmbase_filter(iface); + if (!filter->source.pin.peer) + return S_OK; + EnterCriticalSection(&filter->state_cs); filter->state = State_Paused; LeaveCriticalSection(&filter->state_cs); @@ -237,6 +246,9 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) struct vfw_capture *filter = impl_from_strmbase_filter(iface); HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + EnterCriticalSection(&filter->state_cs); filter->state = State_Stopped; LeaveCriticalSection(&filter->state_cs); @@ -255,7 +267,11 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) static HRESULT vfw_capture_wait_state(struct strmbase_filter *iface, DWORD timeout) { - return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK; + struct vfw_capture *filter = impl_from_strmbase_filter(iface); + + if (filter->source.pin.peer && filter->filter.state == State_Paused) + return VFW_S_CANT_CUE; + return S_OK; } static const struct strmbase_filter_ops filter_ops =

1 0

Zebediah Figura : ws2_32: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 4a56c41462a7b094050e5b012031a143b5edcc84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a56c41462a7b094050e5b01… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 4 19:35:37 2022 -0600 ws2_32: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 1 - dlls/ws2_32/async.c | 3 +- dlls/ws2_32/protocol.c | 52 ++++++++++++------------ dlls/ws2_32/socket.c | 104 ++++++++++++++++++++++++------------------------ 4 files changed, 79 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a56c41462a7b094050e…

1 0

Conor McCarthy : vkd3d: Use a helper function to find and init UAV counters.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: vkd3d Branch: master Commit: ce243da81a5254175b03473e9784a38a0a8c0788 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce243da81a5254175b03473… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 5 01:55:18 2022 +1000 vkd3d: Use a helper function to find and init UAV counters. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 61 +++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ce00dfe..034aedb 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1889,18 +1889,40 @@ static HRESULT d3d12_pipeline_state_init_uav_counters(struct d3d12_pipeline_stat return S_OK; } +static HRESULT d3d12_pipeline_state_find_and_init_uav_counters(struct d3d12_pipeline_state *state, + struct d3d12_device *device, const struct d3d12_root_signature *root_signature, + const D3D12_SHADER_BYTECODE *code, VkShaderStageFlags stage_flags) +{ + struct vkd3d_shader_scan_descriptor_info shader_info; + HRESULT hr; + int ret; + + shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; + shader_info.next = NULL; + if ((ret = vkd3d_scan_dxbc(code, &shader_info)) < 0) + { + WARN("Failed to scan shader bytecode, stage %#x, vkd3d result %d.\n", stage_flags, ret); + return hresult_from_vkd3d_result(ret); + } + + if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, device, root_signature, &shader_info, stage_flags))) + WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); + + vkd3d_shader_free_scan_descriptor_info(&shader_info); + + return hr; +} + static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - struct vkd3d_shader_scan_descriptor_info shader_info; struct vkd3d_shader_interface_info shader_interface; struct vkd3d_shader_descriptor_offset_info offset_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_spirv_target_info target_info; VkPipelineLayout vk_pipeline_layout; HRESULT hr; - int ret; state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl; state->refcount = 1; @@ -1913,21 +1935,9 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return E_INVALIDARG; } - shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO; - shader_info.next = NULL; - if ((ret = vkd3d_scan_dxbc(&desc->CS, &shader_info)) < 0) - { - WARN("Failed to scan shader bytecode, vkd3d result %d.\n", ret); - return hresult_from_vkd3d_result(ret); - } - - if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, - device, root_signature, &shader_info, VK_SHADER_STAGE_COMPUTE_BIT))) - { - WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); + if (FAILED(hr = d3d12_pipeline_state_find_and_init_uav_counters(state, device, root_signature, + &desc->CS, VK_SHADER_STAGE_COMPUTE_BIT))) return hr; - } - vkd3d_shader_free_scan_descriptor_info(&shader_info); memset(&target_info, 0, sizeof(target_info)); target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; @@ -2724,30 +2734,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { - struct vkd3d_shader_scan_descriptor_info shader_info = - { - .type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO, - }; const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; if (!b->pShaderBytecode) continue; - if ((ret = vkd3d_scan_dxbc(b, &shader_info)) < 0) - { - WARN("Failed to scan shader bytecode, stage %#x, vkd3d result %d.\n", - shader_stages[i].stage, ret); - hr = hresult_from_vkd3d_result(ret); + if (FAILED(hr = d3d12_pipeline_state_find_and_init_uav_counters(state, device, root_signature, + b, shader_stages[i].stage))) goto fail; - } - if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, - device, root_signature, &shader_info, shader_stages[i].stage))) - { - WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); - goto fail; - } - vkd3d_shader_free_scan_descriptor_info(&shader_info); shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0;

1 0

Conor McCarthy : vkd3d: Pass shader extension info to all graphics stages.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: vkd3d Branch: master Commit: 3fe14928117bf5285dce3d97868dc522c21ee26c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3fe14928117bf5285dce3d9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 5 01:55:17 2022 +1000 vkd3d: Pass shader extension info to all graphics stages. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 12c7a9e..ce00dfe 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2450,13 +2450,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s VkVertexInputBindingDivisorDescriptionEXT *binding_divisor; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; uint32_t instance_divisors[D3D12_VS_INPUT_REGISTER_COUNT]; + struct vkd3d_shader_spirv_target_info *stage_target_info; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_parameter ps_shader_parameters[1]; struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; - struct vkd3d_shader_descriptor_offset_info offset_info; - struct vkd3d_shader_spirv_target_info *target_info; + struct vkd3d_shader_spirv_target_info target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; bool have_attachment, is_dsv_format_unknown; @@ -2661,6 +2662,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } } + memset(&target_info, 0, sizeof(target_info)); + target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; + target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + target_info.extensions = vk_info->shader_extensions; + target_info.extension_count = vk_info->shader_extension_count; + graphics->xfb_enabled = false; if (so_desc->NumEntries) { @@ -2713,7 +2720,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s offset_info.descriptor_table_count = 0; offset_info.binding_offsets = root_signature->descriptor_offsets; offset_info.uav_counter_offsets = NULL; - vkd3d_prepend_struct(&shader_interface, &offset_info); } for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) @@ -2745,7 +2751,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; - target_info = NULL; + stage_target_info = &target_info; switch (shader_stages[i].stage) { case VK_SHADER_STAGE_VERTEX_BIT: @@ -2772,7 +2778,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s case VK_SHADER_STAGE_FRAGMENT_BIT: shader_interface.uav_counters = state->uav_counters.bindings; shader_interface.uav_counter_count = state->uav_counters.binding_count; - target_info = &ps_target_info; + stage_target_info = &ps_target_info; break; default: @@ -2781,10 +2787,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } shader_interface.next = NULL; + xfb_info.next = NULL; + ps_target_info.next = NULL; + target_info.next = NULL; + offset_info.next = NULL; if (shader_stages[i].stage == xfb_stage) vkd3d_prepend_struct(&shader_interface, &xfb_info); - if (target_info) - vkd3d_prepend_struct(&shader_interface, target_info); + vkd3d_prepend_struct(&shader_interface, stage_target_info); + if (root_signature->descriptor_offsets) + vkd3d_prepend_struct(&shader_interface, &offset_info); if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface)))

1 0

Conor McCarthy : vkd3d: Use a helper function to copy descriptor set layouts to an array.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: vkd3d Branch: master Commit: de031bfb297419b249b43d536e9fcc20a43a1162 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de031bfb297419b249b43d5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Feb 5 01:55:19 2022 +1000 vkd3d: Use a helper function to copy descriptor set layouts to an array. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 034aedb..1d4f91e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1126,6 +1126,17 @@ static HRESULT vkd3d_create_pipeline_layout(struct d3d12_device *device, return S_OK; } +static unsigned int d3d12_root_signature_copy_descriptor_set_layouts(const struct d3d12_root_signature *root_signature, + VkDescriptorSetLayout *vk_set_layouts) +{ + unsigned int i; + + for (i = 0; i < root_signature->vk_set_count; ++i) + vk_set_layouts[i] = root_signature->descriptor_set_layouts[i].vk_layout; + + return i; +} + static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signature, struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc) { @@ -1222,12 +1233,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa vkd3d_free(binding_desc); binding_desc = NULL; - for (i = 0; i < root_signature->vk_set_count; ++i) - { - vk_layouts[i] = root_signature->descriptor_set_layouts[i].vk_layout; - } - - if (FAILED(hr = vkd3d_create_pipeline_layout(device, root_signature->vk_set_count, + i = d3d12_root_signature_copy_descriptor_set_layouts(root_signature, vk_layouts); + if (FAILED(hr = vkd3d_create_pipeline_layout(device, i, vk_layouts, root_signature->push_constant_range_count, root_signature->push_constant_ranges, &root_signature->vk_pipeline_layout))) goto fail; @@ -1833,8 +1840,7 @@ static HRESULT d3d12_pipeline_state_init_uav_counters(struct d3d12_pipeline_stat state->uav_counters.binding_count = uav_counter_count; descriptor_binding = 0; - for (set_index = 0; set_index < root_signature->vk_set_count; ++set_index) - set_layouts[set_index] = root_signature->descriptor_set_layouts[set_index].vk_layout; + set_index = d3d12_root_signature_copy_descriptor_set_layouts(root_signature, set_layouts); for (i = 0, j = 0; i < shader_info->descriptor_count; ++i) {

1 0

Alexandre Julliard : vkd3d: Add a create thread implementation for Windows.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: vkd3d Branch: master Commit: c78174f004d332609ef7e6c64cc090f7921e4b60 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c78174f004d332609ef7e6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 7 13:54:35 2022 +0100 vkd3d: Add a create thread implementation for Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/device.c | 42 ++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 14 ++++++++++---- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fe90eb3..3360fd6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4037,6 +4037,23 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, device->removed_reason = reason; } + +#ifdef _WIN32 +struct thread_data +{ + PFN_vkd3d_thread main_pfn; + void *data; +}; + +static DWORD WINAPI call_thread_main(void *data) +{ + struct thread_data *thread_data = data; + thread_data->main_pfn(thread_data->data); + vkd3d_free(thread_data); + return 0; +} +#endif + HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) { @@ -4053,11 +4070,27 @@ HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, } else { +#ifdef _WIN32 + struct thread_data *thread_data; + + if (!(thread_data = vkd3d_malloc(sizeof(*thread_data)))) + return E_OUTOFMEMORY; + + thread_data->main_pfn = thread_main; + thread_data->data = data; + if (!(thread->handle = CreateThread(NULL, 0, call_thread_main, thread_data, 0, NULL))) + { + ERR("Failed to create thread, error %d.\n", GetLastError()); + vkd3d_free(thread_data); + hr = E_FAIL; + } +#else if ((rc = pthread_create(&thread->pthread, NULL, thread_main, data))) { ERR("Failed to create thread, error %d.\n", rc); hr = hresult_from_errno(rc); } +#endif } return hr; @@ -4075,11 +4108,20 @@ HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_ha } else { +#ifdef _WIN32 + if ((rc = WaitForSingleObject(thread->handle, INFINITE)) != WAIT_OBJECT_0) + { + ERR("Failed to wait for thread, ret %#x.\n", rc); + hr = E_FAIL; + } + CloseHandle(thread->handle); +#else if ((rc = pthread_join(thread->pthread, NULL))) { ERR("Failed to join thread, error %d.\n", rc); hr = hresult_from_errno(rc); } +#endif } return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ece1113..67989c1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -40,7 +40,6 @@ #include <assert.h> #include <inttypes.h> #include <limits.h> -#include <pthread.h> #include <stdbool.h> #define VK_CALL(f) (vk_procs->f) @@ -169,14 +168,13 @@ struct vkd3d_instance LONG refcount; }; +#ifdef _WIN32 + union vkd3d_thread_handle { - pthread_t pthread; void *handle; }; -#ifdef _WIN32 - struct vkd3d_mutex { CRITICAL_SECTION lock; @@ -241,6 +239,14 @@ static inline int vkd3d_cond_destroy(struct vkd3d_cond *cond) #else /* _WIN32 */ +#include <pthread.h> + +union vkd3d_thread_handle +{ + pthread_t pthread; + void *handle; +}; + struct vkd3d_mutex { pthread_mutex_t lock;

1 0

Alexandre Julliard : configure: Don't require pthread for Mingw builds.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: vkd3d Branch: master Commit: ff5530d7ad0c0bac2a65796c83acec2998182b8e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff5530d7ad0c0bac2a65796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 7 13:55:43 2022 +0100 configure: Don't require pthread for Mingw builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure.ac | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d296dfd..45220f8 100644 --- a/configure.ac +++ b/configure.ac @@ -69,11 +69,10 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no]) dnl Check for headers -AC_CHECK_HEADERS([dlfcn.h pthread.h \ +AC_CHECK_HEADERS([dlfcn.h \ vulkan/vulkan.h \ vulkan/spirv.h vulkan/GLSL.std.450.h \ spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h]) -AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h not found.])]) AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes" \ -a "x$ac_cv_header_vulkan_spirv_h" != "xyes"], @@ -103,8 +102,15 @@ AC_CHECK_LIB([dl], [dlopen], [DL_LIBS="-ldl"], [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) -AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) -VKD3D_CHECK_PTHREAD +case $host_os in + mingw32*) ;; + *) AC_CHECK_HEADERS([pthread.h]) + AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) + AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) + VKD3D_CHECK_PTHREAD + VKD3D_CHECK_PTHREAD_SETNAME_NP + ;; +esac AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_VULKAN @@ -132,8 +138,6 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__built VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -VKD3D_CHECK_PTHREAD_SETNAME_NP - dnl Makefiles AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])])

1 0