April 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Don't use libwine for Windows builds.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: f689c723a208971e4e35ea4b5bbf7c48da8ec632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f689c723a208971e4e35ea4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:02:12 2019 +0200 makefiles: Don't use libwine for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - configure | 18 ++-------- configure.ac | 7 ---- libs/wine/Makefile.in | 1 - libs/wine/wine.def | 94 --------------------------------------------------- tools/makedep.c | 25 ++------------ 6 files changed, 5 insertions(+), 141 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4990b04..061103a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,6 @@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ WINELOADER_LDFLAGS = @WINELOADER_LDFLAGS@ WINEPRELOADER_LDFLAGS = @WINEPRELOADER_LDFLAGS@ LIBWINE_SHAREDLIB = @LIBWINE_SHAREDLIB@ -LIBWINE_IMPORTLIB = @LIBWINE_IMPORTLIB@ LIBWINE_LDFLAGS = @LIBWINE_LDFLAGS@ LIBWINE_DEPENDS = @LIBWINE_DEPENDS@ DISABLED_SUBDIRS = @DISABLED_SUBDIRS@ diff --git a/configure b/configure index 6f9013c..9a264fa 100755 --- a/configure +++ b/configure @@ -704,8 +704,11 @@ PTHREAD_LIBS CROSSCFLAGS CROSSCC CROSSTARGET +LIBWINE_DEPENDS PRELINK WINELOADER_DEPENDS +LIBWINE_LDFLAGS +LIBWINE_SHAREDLIB METAL_LIBS CARBON_LIBS QUICKTIME_LIBS @@ -724,10 +727,6 @@ OBJCPP ac_ct_OBJC OBJCFLAGS OBJC -LIBWINE_DEPENDS -LIBWINE_LDFLAGS -LIBWINE_IMPORTLIB -LIBWINE_SHAREDLIB DLLTOOL WINELOADER_PROGRAMS CONFIGURE_TARGETS @@ -8161,17 +8160,6 @@ fi enable_server=${enable_server:-no} with_x=${with_x:-no} with_pthread=${with_pthread:-no} - - LIBWINE_SHAREDLIB="libwine.dll" - - LIBWINE_IMPORTLIB="libwine.a" - - LIBWINE_LDFLAGS="-shared \$(srcdir)/wine.def" - - LIBWINE_DEPENDS="wine.def" - - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.dll" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.a" ;; darwin*|macosx*) diff --git a/configure.ac b/configure.ac index 6c72566..eaee17e 100644 --- a/configure.ac +++ b/configure.ac @@ -731,13 +731,6 @@ case $host_os in dnl Disable dependencies that are not useful on Windows with_x=${with_x:-no} with_pthread=${with_pthread:-no} - - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.dll") - AC_SUBST(LIBWINE_IMPORTLIB,"libwine.a") - AC_SUBST(LIBWINE_LDFLAGS,"-shared \$(srcdir)/wine.def") - AC_SUBST(LIBWINE_DEPENDS,"wine.def") - TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.dll" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.a" ;; darwin*|macosx*) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 6525a53..789d09a 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -19,7 +19,6 @@ config_EXTRADEFS = \ -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" SHAREDLIB = $(LIBWINE_SHAREDLIB) -IMPORTLIB = $(LIBWINE_IMPORTLIB) libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) diff --git a/libs/wine/wine.def b/libs/wine/wine.def deleted file mode 100644 index 3c88f8a..0000000 --- a/libs/wine/wine.def +++ /dev/null @@ -1,94 +0,0 @@ -LIBRARY libwine.dll - -EXPORTS - __wine_dbg_get_channel_flags PRIVATE - __wine_dbg_set_channel_flags - __wine_dbg_set_functions - __wine_dll_register - __wine_main_argc - __wine_main_argv - __wine_main_environ - __wine_main_wargv - atoiW - atolW - get_char_typeW - isalnumW - isalphaW - iscntrlW - isdigitW - isgraphW - islowerW - isprintW - ispunctW - isspaceW - isupperW - isxdigitW - memchrW - memicmpW - memrchrW - snprintfW - sprintfW - strcatW - strchrW - strcmpW - strcmpiW - strcpyW - strcspnW - strlenW - strlwrW - strncmpW - strncmpiW - strpbrkW - strrchrW - strspnW - strstrW - strtolW - strtoulW - struprW - tolowerW - toupperW - vsnprintfW - vsprintfW - wine_call_on_stack - wine_casemap_lower - wine_casemap_upper - wine_compare_string - wine_cp_enum_table - wine_cp_get_table - wine_cp_mbstowcs - wine_cp_wcstombs - wine_cpsymbol_mbstowcs - wine_cpsymbol_wcstombs - wine_dbg_log - wine_dbg_printf - wine_dbg_sprintf - wine_dbgstr_an - wine_dbgstr_wn - wine_dlclose - wine_dll_enum_load_path - wine_dll_get_owner - wine_dll_load - wine_dll_load_main_exe - wine_dll_set_callback - wine_dll_unload - wine_dlopen - wine_dlsym - wine_exec_wine_binary - wine_fold_string - wine_get_build_dir - wine_get_build_id - wine_get_config_dir - wine_get_data_dir - wine_get_server_dir - wine_get_sortkey - wine_get_user_name - wine_get_version - wine_init - wine_init_argv0_path - wine_is_dbcs_leadbyte - wine_pthread_get_functions - wine_pthread_set_functions - wine_switch_to_stack - wine_utf8_mbstowcs - wine_utf8_wcstombs - wine_wctype_table diff --git a/tools/makedep.c b/tools/makedep.c index 532ef52..2b916af 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3095,7 +3095,6 @@ static void output_module( struct makefile *make ) } else { - strarray_add( &all_libs, "-lwine" ); strarray_add( &make->all_targets, make->module ); add_install_rule( make, make->module, make->module, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module )); @@ -3246,22 +3245,6 @@ static void output_shared_lib( struct makefile *make ) /******************************************************************* - * output_import_lib - */ -static void output_import_lib( struct makefile *make ) -{ - char *def_file = replace_extension( make->importlib, ".a", ".def" ); - - /* stand-alone import lib (for libwine) */ - if (!strncmp( def_file, "lib", 3 )) def_file += 3; - output( "%s: %s\n", obj_dir_path( make, make->importlib ), src_dir_path( make, def_file )); - output( "\t%s -l $@ -d %s\n", dlltool, src_dir_path( make, def_file )); - add_install_rule( make, make->importlib, make->importlib, strmake( "d$(libdir)/%s", make->importlib )); - strarray_add( &make->all_targets, make->importlib ); -} - - -/******************************************************************* * output_test_module */ static void output_test_module( struct makefile *make ) @@ -3713,12 +3696,8 @@ static void output_sources( struct makefile *make ) if (make->staticlib) output_static_lib( make ); else if (make->module) output_module( make ); else if (make->testdll) output_test_module( make ); - else - { - if (make->importlib) output_import_lib( make ); - if (make->sharedlib) output_shared_lib( make ); - if (make->programs.count) output_programs( make ); - } + else if (make->sharedlib) output_shared_lib( make ); + else if (make->programs.count) output_programs( make ); for (i = 0; i < make->scripts.count; i++) add_install_rule( make, make->scripts.str[i], make->scripts.str[i],

1 0

Józef Kucia : vkd3d-shader: Drop support for dummy samplers.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 5842898cc7144974342d87ab670c3eaaf1cca6ad URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5842898cc7144974342d87a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:28 2019 +0200 vkd3d-shader: Drop support for dummy samplers. This shouldn't be needed by any Vulkan driver anymore. 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 | 55 ++++++++--------------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6cacf7c..e036c71 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4602,32 +4602,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) -{ - const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; - const SpvStorageClass storage_class = SpvStorageClassUniformConstant; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, var_id; - - if (compiler->dummy_sampler_id) - return compiler->dummy_sampler_id; - - type_id = vkd3d_spirv_get_op_type_sampler(builder); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); - var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); - - vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationDescriptorSet, shader_interface->dummy_sampler.set); - vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationBinding, shader_interface->dummy_sampler.binding); - - vkd3d_spirv_build_op_name(builder, var_id, "dummy_sampler"); - - compiler->dummy_sampler_id = var_id; - return compiler->dummy_sampler_id; -} - static const struct vkd3d_spirv_resource_type *vkd3d_dxbc_compiler_enable_resource_type( struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_resource_type resource_type, bool is_uav) { @@ -6746,11 +6720,9 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (sampled) { assert(image->image_id); + assert(sampler_reg); - if (sampler_reg) - sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); - else - sampler_var_id = vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler); + sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); @@ -6781,7 +6753,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t image_id, type_id, coordinate_id, val_id; + uint32_t type_id, coordinate_id, val_id; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; @@ -6791,9 +6763,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, multisample = instruction->handler_idx == VKD3DSIH_LD2DMS; - /* OpImageFetch must be used with a sampled image. */ - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); - image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; @@ -6818,7 +6788,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, } assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, - image_id, coordinate_id, operands_mask, image_operands, image_operand_count); + image.image_id, coordinate_id, operands_mask, image_operands, image_operand_count); vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, dst, val_id, image.sampled_type, src[1].swizzle); @@ -7041,10 +7011,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_raw_structured_addressing( static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t coordinate_id, type_id, val_id, image_id, texel_type_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t coordinate_id, type_id, val_id, texel_type_id; const struct vkd3d_shader_src_param *resource; uint32_t base_coordinate_id, component_idx; uint32_t constituents[VKD3D_VEC4_SIZE]; @@ -7055,18 +7025,11 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc resource = &src[instruction->src_count - 1]; if (resource->reg.type == VKD3DSPR_RESOURCE) - { - /* OpImageFetch must be used with a sampled image. */ op = SpvOpImageFetch; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); - image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); - } else - { op = SpvOpImageRead; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - image_id = image.image_id; - } + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, @@ -7085,7 +7048,7 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, - op, texel_type_id, image_id, coordinate_id); + op, texel_type_id, image.image_id, coordinate_id); constituents[j++] = vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, 0); }

1 0

Zhiyi Zhang : vkd3d: Improve UMA memory detection.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 32a15c089a2e619127ca0f6f4130e06d72912ab5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32a15c089a2e619127ca0f6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 3 21:50:27 2019 +0800 vkd3d: Improve UMA memory detection. Some vulkan implementation report 2 memory types with the same VkMemoryPropertyFlags for a device. So check property flags to determine if UMA and CacheCoherentUMA are actually supported by the device. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a754077..8563b43 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2098,6 +2098,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { struct d3d12_device *device = impl_from_ID3D12Device(iface); + unsigned int i; TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", iface, feature, feature_data, feature_data_size); @@ -2138,18 +2139,16 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; - if (device->memory_properties.memoryTypeCount == 1) - { - TRACE("Assuming cache coherent UMA.\n"); - data->UMA = TRUE; - data->CacheCoherentUMA = TRUE; - } - else + data->UMA = TRUE; + data->CacheCoherentUMA = TRUE; + for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) { - FIXME("Assuming NUMA.\n"); - data->UMA = FALSE; - data->CacheCoherentUMA = FALSE; + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + data->UMA = FALSE; + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + data->CacheCoherentUMA = FALSE; } + TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA); return S_OK; }

1 0

Józef Kucia : vkd3d: Add support for VK_EXT_depth_clip_enable.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: a95c9f8ad8bd6cc3e3aba23792a18028749639d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a95c9f8ad8bd6cc3e3aba23… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:31 2019 +0200 vkd3d: Add support for VK_EXT_depth_clip_enable. 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/device.c | 22 ++++++++++++++++++++++ libs/vkd3d/state.c | 47 +++++++++++++++++++++++++++++++++++----------- libs/vkd3d/vkd3d_private.h | 4 +++- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 11 +++++++++++ 6 files changed, 74 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a95c9f8ad8bd6cc3e3a…

1 0

Józef Kucia : vkd3d: Simplify d3d12_command_list_update_descriptor_table().
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 32aa45a86db962cd4bd7dbf780c8a8db6086b492 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32aa45a86db962cd4bd7dbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:30 2019 +0200 vkd3d: Simplify d3d12_command_list_update_descriptor_table(). 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 | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 936e965..b9deffe 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2057,7 +2057,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des } static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; @@ -2072,19 +2072,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor_count = 0; - for (i = 0; i < descriptor_table->range_count; ++i) - descriptor_count += descriptor_table->ranges[i].descriptor_count; - - if (!descriptor_count) - return; - - if (!(descriptor = d3d12_desc_from_gpu_handle(base_descriptor))) - { - WARN("Descriptor table %u is not set.\n", index); - return; - } - + descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2094,7 +2082,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { - descriptor = d3d12_desc_from_gpu_handle(base_descriptor) + range->offset; + descriptor = base_descriptor + range->offset; } for (j = 0; j < range->descriptor_count; ++j, ++descriptor) @@ -2296,6 +2284,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_root_signature *rs = bindings->root_signature; + struct d3d12_desc *base_descriptor; unsigned int i; if (!rs || !rs->pool_size_count || !rs->vk_set_layout) @@ -2307,7 +2296,12 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - d3d12_command_list_update_descriptor_table(list, bind_point, i, bindings->descriptor_tables[i]); + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } } bindings->descriptor_table_dirty_mask = 0;

1 0

Józef Kucia : include: Introduce VKD3D_NO_TRACE_MESSAGES and VKD3D_NO_DEBUG_MESSAGES.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 0abbf5ed763ed5dcec75900b93737baa97e69c87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0abbf5ed763ed5dcec75900… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:32 2019 +0200 include: Introduce VKD3D_NO_TRACE_MESSAGES and VKD3D_NO_DEBUG_MESSAGES. 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> --- include/private/vkd3d_debug.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 42e5903..5d798ef 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -23,6 +23,15 @@ #include <stdarg.h> +#ifdef VKD3D_NO_TRACE_MESSAGES +#define TRACE(args...) +#endif + +#ifdef VKD3D_NO_DEBUG_MESSAGES +#define WARN(args...) +#define FIXME(args...) +#endif + enum vkd3d_dbg_level { VKD3D_DBG_LEVEL_NONE, @@ -50,9 +59,18 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define VKD3D_DBG_PRINTF(args...) \ vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0) +#ifndef TRACE #define TRACE VKD3D_DBG_LOG(TRACE) +#endif + +#ifndef WARN #define WARN VKD3D_DBG_LOG(WARN) +#endif + +#ifndef FIXME #define FIXME VKD3D_DBG_LOG(FIXME) +#endif + #define ERR VKD3D_DBG_LOG(ERR) #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE)

1 0

Józef Kucia : vkd3d: Drop support for dummy sampler.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: vkd3d Branch: master Commit: 41274e6285f8d126eb3f40c5fd4a93a2353e8ca4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41274e6285f8d126eb3f40c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 4 13:01:29 2019 +0200 vkd3d: Drop support for dummy sampler. 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> --- include/vkd3d_shader.h | 6 ------ libs/vkd3d-shader/spirv.c | 1 - libs/vkd3d/device.c | 21 --------------------- libs/vkd3d/state.c | 32 -------------------------------- libs/vkd3d/vkd3d_private.h | 4 ---- 5 files changed, 64 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ed4c0a0..15a0b22 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -144,12 +144,6 @@ struct vkd3d_shader_interface_info const struct vkd3d_shader_combined_resource_sampler *combined_samplers; unsigned int combined_sampler_count; - /* A sampler used by OpImageFetches generated for SM4 ld instructions. - * - * In Vulkan OpImageFetch must be used with a sampled image. - */ - struct vkd3d_shader_descriptor_binding dummy_sampler; - const struct vkd3d_shader_uav_counter_binding *uav_counters; unsigned int uav_counter_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e036c71..b013416 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2004,7 +2004,6 @@ struct vkd3d_dxbc_compiler uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; - uint32_t dummy_sampler_id; uint32_t binding_idx; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8563b43..78f339f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1634,18 +1634,6 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, return hr; } -static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) -{ - D3D12_STATIC_SAMPLER_DESC sampler_desc; - - memset(&sampler_desc, 0, sizeof(sampler_desc)); - sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); -} - static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1855,7 +1843,6 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); @@ -3003,17 +2990,10 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->removed_reason = S_OK; device->vk_device = VK_NULL_HANDLE; - device->vk_dummy_sampler = VK_NULL_HANDLE; if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) goto out_free_instance; - if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) - { - ERR("Failed to create dummy sampler, hr %#x.\n", hr); - goto out_free_vk_resources; - } - if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; @@ -3041,7 +3021,6 @@ out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); out_free_instance: vkd3d_instance_decref(device->vkd3d_instance); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index aa9f62b..c7ae63b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -775,24 +775,6 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign return S_OK; } -static HRESULT d3d12_root_signature_init_dummy_sampler(struct d3d12_root_signature *root_signature, - struct d3d12_device *device, struct vkd3d_descriptor_set_context *context) -{ - VkDescriptorSetLayoutBinding *binding = context->current_binding; - - root_signature->dummy_sampler.set = context->set_index; - root_signature->dummy_sampler.binding = context->descriptor_binding++; - - binding->binding = root_signature->dummy_sampler.binding; - binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; - binding->descriptorCount = 1; - binding->stageFlags = VK_SHADER_STAGE_ALL; - binding->pImmutableSamplers = &device->vk_dummy_sampler; - - ++context->current_binding; - return S_OK; -} - static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signature *root_signature, struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) @@ -883,7 +865,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa VkDescriptorSetLayoutBinding *binding_desc; struct d3d12_root_signature_info info; VkDescriptorSetLayout set_layouts[2]; - bool needs_dummy_sampler; HRESULT hr; memset(&context, 0, sizeof(context)); @@ -924,14 +905,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->static_sampler_count = desc->NumStaticSamplers; root_signature->root_descriptor_count = info.root_descriptor_count; - /* An additional sampler is created for SpvOpImageFetch. */ - needs_dummy_sampler = info.srv_count || info.buffer_srv_count; - if (needs_dummy_sampler) - { - ++info.sampler_count; - ++info.descriptor_count; - } - hr = E_OUTOFMEMORY; root_signature->parameter_count = desc->NumParameters; if (!(root_signature->parameters = vkd3d_calloc(root_signature->parameter_count, @@ -978,9 +951,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context))) goto fail; - if (needs_dummy_sampler && FAILED(hr = d3d12_root_signature_init_dummy_sampler(root_signature, - device, &context))) - goto fail; root_signature->main_set = context.set_index; if (context.descriptor_binding) @@ -1421,7 +1391,6 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2148,7 +2117,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c071b41..24d26d9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -584,7 +584,6 @@ struct d3d12_root_signature unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; - struct vkd3d_shader_descriptor_binding dummy_sampler; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; @@ -912,9 +911,6 @@ struct d3d12_device pthread_mutex_t pipeline_cache_mutex; VkPipelineCache vk_pipeline_cache; - /* A sampler used for SpvOpImageFetch. */ - VkSampler vk_dummy_sampler; - VkPhysicalDeviceMemoryProperties memory_properties; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options;

1 0

Julian Rüger : German translation for release 4.5.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: website Branch: master Commit: 5f521dcb7654a37db97844066fc5ffd1b89a28ae URL: https://source.winehq.org/git/website.git/?a=commit;h=5f521dcb7654a37db9784… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Apr 3 15:41:38 2019 +0200 German translation for release 4.5. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019032901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2019032901.xml b/news/de/2019032901.xml new file mode 100644 index 0000000..0594750 --- /dev/null +++ b/news/de/2019032901.xml @@ -0,0 +1,17 @@ +<news> +<date>29. März 2019</date> +<title>Wine 4.5 freigegeben</title> +<body> + Die Entwicklungsversion 4.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Vulkan 1.1.</li> + <li>Bessere Unterstützung von Kernelobjekten in Gerätetreibern.</li> + <li>Weitere Media-Foundation-APIs implementiert.</li> + <li>Unterstützung von SVG-Elementen in MSHTML.</li> + <li>Korrekturen für Konvertierungsprobleme zwischen Groß-/Kleinschreibung in Türkischer Umgebung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.5.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 4.4.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: website Branch: master Commit: 54d154b1aad2b1f60cac1a35f503dc5ea56c343a URL: https://source.winehq.org/git/website.git/?a=commit;h=54d154b1aad2b1f60cac1… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Apr 3 15:37:59 2019 +0200 German translation for release 4.4. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2019031501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2019031501.xml b/news/de/2019031501.xml new file mode 100644 index 0000000..dc4b40b --- /dev/null +++ b/news/de/2019031501.xml @@ -0,0 +1,15 @@ +<news> +<date>15. März 2019</date> +<title>Wine 4.4 freigegeben</title> +<body> + Die Entwicklungsversion 4.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/4.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neues MSIDB-Werkzeug um MSI-Datenbanken zu bearbeiten.</li> + <li>Unterstützung selbstgezeichneter Schaltflächen in Common-Controls.</li> + <li>Deutlich mehr implementierte Media-Foundation-APIs.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/4.x/wine-4.4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Zebediah Figura : d3d9: Forbid creating a stateblock while recording.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: dd0bed46a56867ed5a03ee2a6ea06d35d925cecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd0bed46a56867ed5a03ee2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:48 2019 -0500 d3d9: Forbid creating a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++++++++ dlls/d3d9/tests/device.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4a41443..bad9211 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2313,6 +2313,15 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to create a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_unlock(); + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ccdc4..e7366b1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10602,7 +10602,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10621,7 +10621,7 @@ static void test_begin_end_state_block(void) IDirect3DStateBlock9_Release(stateblock); IDirect3DStateBlock9_Release(stateblock2); refcount = IDirect3DDevice9_Release(device); - todo_wine ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0