August 2018 - Wine-Commits - list.winehq.org

Chip Davis : build: Make the output a little less verbose when V=0.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 09bf24d910dc4acbc122463cc7a00b966dac9d69 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09bf24d910dc4acbc122463… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Aug 10 16:01:30 2018 -0500 build: Make the output a little less verbose when V=0. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 770b6e0..f696284 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,16 +151,16 @@ EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< - $(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ - $(RM) $@.tmp + $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ + $(AM_V_at)$(RM) $@.tmp else - echo "widl is required to generate $<" + @echo "widl is required to generate $<" endif EXTRA_DIST += $(vkd3d_demos_shaders) libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in - sed -e 's![@]prefix[@]!$(prefix)!g' \ + $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ -e 's![@]libdir[@]!$(libdir)!g' \ @@ -168,7 +168,7 @@ libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in $< > $@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in - sed -e 's![@]prefix[@]!$(prefix)!g' \ + $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ -e 's![@]libdir[@]!$(libdir)!g' \ @@ -176,7 +176,7 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in $< > $@ libs/vkd3d_version.c: dummy-vkd3d-version - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) + $(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) .SILENT: libs/vkd3d_version.c CLEANFILES += libs/vkd3d_version.c

1 0

Chip Davis : build: Make the sed(1) command more portable.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 923ec78c019bbf6b12b5afc96332c1d01f2f189b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=923ec78c019bbf6b12b5afc… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Aug 10 16:01:29 2018 -0500 build: Make the sed(1) command more portable. BSD sed(1) requires an argument after -i giving the suffix to put on the backup it makes. Also, the regular expression given doesn't seem to work for me. This command should work everywhere. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 14f2d51..770b6e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -150,8 +150,9 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL - $(VKD3D_V_WIDL)$(WIDL) -o $@ $< - sed -e '/#include <$rpc.h\|rpcndr.h$>/d' -i $@ + $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< + $(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ + $(RM) $@.tmp else echo "widl is required to generate $<" endif

1 0

Józef Kucia : vkd3d: Add few more formats.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 0488b24c999bc87c8f4f79217dc77b383492c14d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0488b24c999bc87c8f4f792… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:54 2018 +0200 vkd3d: Add few more formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 98b764a..e6b949d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -35,6 +35,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, @@ -52,6 +53,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_D16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, {DXGI_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8_TYPELESS, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UINT, VK_FORMAT_R8_UINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR},

1 0

Józef Kucia : vkd3d: Call vkCmdBindDescriptorSets() only with valid descriptor set.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: ef999e1e2bc2f0efd7e6d777e932ae8817f04827 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ef999e1e2bc2f0efd7e6d77… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:55 2018 +0200 vkd3d: Call vkCmdBindDescriptorSets() only with valid descriptor set. If the current pipeline state doesn't need any descriptors it is perfectly valid to not have a descriptor set. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4536264..501a067 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2188,9 +2188,12 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis } bindings->descriptor_table_dirty_mask = 0; - bindings->in_use = true; - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, - rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); + if (bindings->descriptor_set) + { + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); + bindings->in_use = true; + } d3d12_command_list_update_uav_counter_descriptors(list, bind_point); }

1 0

Józef Kucia : vkd3d: Avoid invalidating graphics pipeline and framebuffer.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 35748f9228ffc7d2923469893d5e75c54b834ad0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=35748f9228ffc7d29234698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:58 2018 +0200 vkd3d: Avoid invalidating graphics pipeline and framebuffer. Do not invalidate the current graphics pipeline and the current framebuffer when a compute pipeline is bound. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 9 ++++++--- libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9455898..3d57545 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2839,15 +2839,18 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); list->state = state; - d3d12_command_list_invalidate_current_framebuffer(list); - d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_bindings(list, state); - if (state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) + if (d3d12_pipeline_state_is_compute(state)) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } + else + { + d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_pipeline(list); + } } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..5974168 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -516,6 +516,11 @@ struct d3d12_pipeline_state struct d3d12_device *device; }; +static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state) +{ + return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE; +} + HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device,

1 0

Józef Kucia : vkd3d: Initialize all fields before calling d3d12_command_allocator_allocate_command_buffer ().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: b500207b7954e2f299f24ab29698b650ce80cddf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b500207b7954e2f299f24ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:57 2018 +0200 vkd3d: Initialize all fields before calling d3d12_command_allocator_allocate_command_buffer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 501a067..9455898 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4001,12 +4001,6 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->allocator = allocator; list->pipeline_state = initial_pipeline_state; - if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) - { - ID3D12Device_Release(&device->ID3D12Device_iface); - return hr; - } - memset(list->strides, 0, sizeof(list->strides)); list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; list->ia_desc.pNext = NULL; @@ -4025,6 +4019,12 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->state = NULL; + if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { + ID3D12Device_Release(&device->ID3D12Device_iface); + return hr; + } + return S_OK; }

1 0

Józef Kucia : libs/vkd3d-shader: Require shader signature elements for shader outputs.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 76f64b86dee08e0ee867ec8cbcbf8692ed12344b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=76f64b86dee08e0ee867ec8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:53 2018 +0200 libs/vkd3d-shader: Require shader signature elements for shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d7c8016..d62d553 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3236,7 +3236,7 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } -static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { unsigned int component_idx, component_count, output_component_count; @@ -3252,8 +3252,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp bool use_private_variable; uint32_t id, var_id; - signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, - &signature_idx, reg->idx[0].offset, dst->write_mask); + if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, + &signature_idx, reg->idx[0].offset, dst->write_mask))) + { + FIXME("No signature element for shader output, ignoring shader output.\n"); + return; + } + builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -3265,7 +3270,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp } else { - component_type = signature_element ? signature_element->component_type : VKD3D_TYPE_FLOAT; + component_type = signature_element->component_type; output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); } assert(component_count <= output_component_count); @@ -3286,15 +3291,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } - if (signature_element) - { - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - } + + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE - || (signature_element - && get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE); + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE; if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -3325,8 +3327,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp if (!compiler->output_setup_function_id) compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); } - - return id; } static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : libs/vkd3d: Add fall-through comment to vkd3d_select_memory_type().
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: 98689bf33c991ffb60323623eceaee43b58f0065 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98689bf33c991ffb6032362… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:51 2018 +0200 libs/vkd3d: Add fall-through comment to vkd3d_select_memory_type(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1456c4b..44f3233 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -417,6 +417,7 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); + /* fall-through */ case D3D12_HEAP_TYPE_UPLOAD: case D3D12_HEAP_TYPE_READBACK: required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;

1 0

Józef Kucia : build: Check how many arguments pthread_setname_np() takes.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: d9858b63b9579efba625d6a591ca8b0249c6e541 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9858b63b9579efba625d6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 18:13:32 2018 +0200 build: Check how many arguments pthread_setname_np() takes. Based on a patch by Chip Davis. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 9 +++++++++ m4/check-functions.m4 | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a610449..d437e1b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco 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_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +VKD3D_CHECK_PTHREAD_SETNAME_NP AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ce5f60f..9aba589 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -200,9 +200,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f9a2f5a..278f4f6 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -826,4 +826,13 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +static inline void vkd3d_set_thread_name(const char *name) +{ +#if defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#endif +} + #endif /* __VKD3D_PRIVATE_H */ diff --git a/m4/check-functions.m4 b/m4/check-functions.m4 index 17082a1..4d018d6 100644 --- a/m4/check-functions.m4 +++ b/m4/check-functions.m4 @@ -14,3 +14,42 @@ AC_DEFUN([VKD3D_CHECK_LIB_FUNCS], LIBS="$LIBS $2" AC_CHECK_FUNCS([$1], [$3], [$4]) LIBS="$vkd3d_libs_saved"]) + +dnl VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP], + [AC_MSG_CHECKING([how many arguments pthread_set_np() takes]) + AC_CACHE_VAL([vkd3d_cv_which_pthread_set_np], [ + +vkd3d_cv_which_pthread_set_np=unknown + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np(pthread_self(), "conftest")])], + [vkd3d_cv_which_pthread_set_np=two]) + +AS_IF([test "$vkd3d_cv_which_pthread_set_np" = "unknown"], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np("conftest")])], + [vkd3d_cv_which_pthread_set_np=one])]) + +]) dnl AC_CACHE_VAL + +AS_CASE(["$vkd3d_cv_which_pthread_set_np"], + [one], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_1], [1], + [Define to 1 if you have the one-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([one])], + + [two], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_2], [1], + [Define to 1 if you have the two-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([two])], + + [AC_MSG_RESULT([unknown])]) + +]) dnl AC_DEFUN + +dnl VKD3D_CHECK_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_PTHREAD_SETNAME_NP], + [VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) + AS_IF([test "x$ac_cv_func_pthread_setname_np" = "xyes"], + [VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP])])

1 0

Józef Kucia : vkd3d: Try to keep current render pass as long as possible.
by Alexandre Julliard Aug. 16, 2018

Aug. 16, 2018

Module: vkd3d Branch: master Commit: c9380f8f7fa930ba16e59c6c23ba6ffcad0a5789 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9380f8f7fa930ba16e59c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:58:00 2018 +0200 vkd3d: Try to keep current render pass as long as possible. A lot of Vulkan commands must be recorded outside a render pass. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 64 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 56 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c9380f8f7fa930ba16e…

1 0