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

Henri Verbeet : tests/shader_runner: Pass only valid stages to vkCreateGraphicsPipelines().
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 037e8436c9aa07a89619535c966a900591091ed6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/037e8436c9aa07a89619535c966a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 21 17:29:29 2024 +0200 tests/shader_runner: Pass only valid stages to vkCreateGraphicsPipelines(). The first thing that's broken is that the "sType" field isn't VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, but we're also passing invalid "module" handles. --- tests/shader_runner_vulkan.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index d9f06980..68a71c01 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -731,19 +731,24 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner, VkPipelineShaderStageCreateInfo stage_desc[4]; struct vkd3d_shader_code vs_dxbc; VkDevice device = runner->device; + unsigned int stage_count = 0; VkPipeline pipeline; unsigned int i, j; VkResult vr; int ret; memset(stage_desc, 0, sizeof(stage_desc)); - ret = create_shader_stage(runner, &stage_desc[0], "vs", VK_SHADER_STAGE_VERTEX_BIT, runner->r.vs_source, &vs_dxbc) - && create_shader_stage(runner, &stage_desc[1], "ps", VK_SHADER_STAGE_FRAGMENT_BIT, runner->r.ps_source, NULL); + ret = create_shader_stage(runner, &stage_desc[stage_count++], "vs", + VK_SHADER_STAGE_VERTEX_BIT, runner->r.vs_source, &vs_dxbc); + ret &= create_shader_stage(runner, &stage_desc[stage_count++], "ps", + VK_SHADER_STAGE_FRAGMENT_BIT, runner->r.ps_source, NULL); if (runner->r.hs_source) { - ret &= create_shader_stage(runner, &stage_desc[1], "hs", VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, runner->r.hs_source, NULL); - ret &= create_shader_stage(runner, &stage_desc[2], "ds", VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, runner->r.ds_source, NULL); + ret &= create_shader_stage(runner, &stage_desc[stage_count++], "hs", + VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, runner->r.hs_source, NULL); + ret &= create_shader_stage(runner, &stage_desc[stage_count++], "ds", + VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, runner->r.ds_source, NULL); } todo_if (runner->r.is_todo) ok(ret, "Failed to compile shaders.\n"); if (!ret) @@ -842,7 +847,7 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner, ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - pipeline_desc.stageCount = ARRAY_SIZE(stage_desc); + pipeline_desc.stageCount = stage_count; pipeline_desc.pStages = stage_desc; pipeline_desc.pVertexInputState = &input_desc; pipeline_desc.pInputAssemblyState = &ia_desc;

1 0

Giovanni Mascellani : include: Document struct vkd3d_optional_instance_extensions_info.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: d27bbce0e11d2a2d71cbbd4a7166ea76d31cb947 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d27bbce0e11d2a2d71cbbd4a7166e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 20 23:40:44 2024 +0200 include: Document struct vkd3d_optional_instance_extensions_info. --- include/vkd3d.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index d72a7b38..6e0c82f8 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -151,13 +151,26 @@ struct vkd3d_instance_create_info uint32_t instance_extension_count; }; -/* Extends vkd3d_instance_create_info. Available since 1.1. */ +/** + * A chained structure to specify optional instance extensions. + * + * This structure extends vkd3d_instance_create_info. + * + * \since 1.1 + */ struct vkd3d_optional_instance_extensions_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * A list of optional Vulkan instance extensions to request. Instance creation does not fail if + * they are not available. + */ const char * const *extensions; + /** The number of elements in the extensions array. */ uint32_t extension_count; };

1 0

Giovanni Mascellani : include: Document struct vkd3d_instance_create_info.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 995a316fba81b645ccedc2e042788816bc87b0cd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/995a316fba81b645ccedc2e042788… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 20 23:29:28 2024 +0200 include: Document struct vkd3d_instance_create_info. --- include/vkd3d.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 0b018eb8..c2b6877c 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -93,20 +93,45 @@ typedef HRESULT (*PFN_vkd3d_join_thread)(void *thread); struct vkd3d_instance; +/** + * A chained structure containing instance creation parameters. + */ struct vkd3d_instance_create_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** An pointer to a function to signal events. */ PFN_vkd3d_signal_event pfn_signal_event; + /** + * An optional pointer to a function to create threads. If this is NULL vkd3d will use a + * function of its choice, depending on the platform. It must be NULL if and only if + * pfn_join_thread is NULL. + */ PFN_vkd3d_create_thread pfn_create_thread; + /** + * An optional pointer to a function to join threads. If this is NULL vkd3d will use a + * function of its choice, depending on the platform. It must be NULL if and only if + * pfn_create_thread is NULL. + */ PFN_vkd3d_join_thread pfn_join_thread; + /** The size of type WCHAR. It must be 2 or 4 and should normally be set to sizeof(WCHAR). */ size_t wchar_size; - /* If set to NULL, libvkd3d loads libvulkan. */ + /** + * A pointer to the vkGetInstanceProcAddr Vulkan function, which will be used to load all the + * other Vulkan functions. If set to NULL, vkd3d will search and use the Vulkan loader. + */ PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr; + /** + * A list of Vulkan instance extensions to request. They are intended as required, so instance + * creation will fail if any of them is not available. + */ const char * const *instance_extensions; + /** The number of elements in the instance_extensions array. */ uint32_t instance_extension_count; };

1 0

Giovanni Mascellani : ci: Run crosstests with DXC too.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 9241e1bcd3c8379b0c25366c4758bee7a4262767 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9241e1bcd3c8379b0c25366c4758b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 19 23:41:55 2024 +0200 ci: Run crosstests with DXC too. This is added as a new job because some tests currently fail. A 32 bit job is not created, instead, because a 32 bit dxcompiler.dll is not available. --- gitlab/test.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gitlab/test.yml b/gitlab/test.yml index a25918dc..da01425f 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -26,3 +26,24 @@ test-win-32: variables: TEST_ARCH: "32" VKD3D_TESTS_SKIP_DXC: "1" + +test-win-64-dxc: + stage: test + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + interruptible: true + allow_failure: true + needs: + - job: build-crosstest + tags: + - win10-21h2 + script: + - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2…" -OutFile ".\dxc.zip"' + - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"' + - '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")' + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)' + - if (Test-Path "pipeline_failed") { exit 1 } + artifacts: + when: always + paths: + - artifacts

1 0

Giovanni Mascellani : include: Document struct vkd3d_structure_type.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: a1ebb3925bbeb37cae1aa22d426c13d7db0969fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1ebb3925bbeb37cae1aa22d426c1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 20 23:36:17 2024 +0200 include: Document struct vkd3d_structure_type. --- include/vkd3d.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index c2b6877c..d72a7b38 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -46,21 +46,37 @@ extern "C" { * \since 1.0 */ +/** The type of a chained structure. */ enum vkd3d_structure_type { - /* 1.0 */ + /** The structure is a vkd3d_instance_create_info structure. */ VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + /** The structure is a vkd3d_device_create_info structure. */ VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, + /** The structure is a vkd3d_image_resource_create_info structure. */ VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, - /* 1.1 */ + /** + * The structure is a vkd3d_optional_instance_extensions_info structure. + * \since 1.1 + */ VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, - /* 1.2 */ + /** + * The structure is a vkd3d_optional_device_extensions_info structure. + * \since 1.2 + */ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + /** + * The structure is a vkd3d_application_info structure. + * \since 1.2 + */ VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, - /* 1.3 */ + /** + * The structure is a vkd3d_host_time_domain_info structure. + * \since 1.3 + */ VKD3D_STRUCTURE_TYPE_HOST_TIME_DOMAIN_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE),

1 0

Giovanni Mascellani : include: Document structure vkd3d_host_time_domain_info.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 7fbd753cf7f4585d14d144b2dcf03892855c2687 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7fbd753cf7f4585d14d144b2dcf03… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 00:01:03 2024 +0200 include: Document structure vkd3d_host_time_domain_info. --- include/vkd3d.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 46867d73..c350c5ea 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -214,12 +214,26 @@ struct vkd3d_application_info enum vkd3d_api_version api_version; }; -/* Extends vkd3d_instance_create_info. Available since 1.3. */ +/** + * A chained structure to specify the host time domain. + * + * This structure extends vkd3d_instance_create_info. + * + * \since 1.3 + */ struct vkd3d_host_time_domain_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_HOST_TIME_DOMAIN_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * The number of clock ticks per second, used for GetClockCalibration(). It should normally + * match the expected result of QueryPerformanceFrequency(). If this chained structure is not + * used then 10 millions is used, which means that each tick is a tenth of microsecond, or + * equivalently 100 nanoseconds. + */ uint64_t ticks_per_second; };

1 0

Giovanni Mascellani : include: Document structure vkd3d_application_info.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: d2d4ed9f630080664e013ebbba86846f4b4b8d2c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d2d4ed9f630080664e013ebbba868… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 00:00:29 2024 +0200 include: Document structure vkd3d_application_info. --- include/vkd3d.h | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 6e0c82f8..46867d73 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -174,18 +174,43 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; -/* Extends vkd3d_instance_create_info. Available since 1.2. */ +/** + * A chained structure to specify application information. + * + * This structure extends vkd3d_instance_create_info. + * + * \since 1.2 + */ struct vkd3d_application_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_APPLICATION_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * The application's name, to be passed to the Vulkan implementation. If it is NULL, a name is + * computed from the process executable filename. If that cannot be done, the empty string is + * used. + */ const char *application_name; + /** The application's version, to be passed to the Vulkan implementation. */ uint32_t application_version; - const char *engine_name; /* "vkd3d" if NULL */ - uint32_t engine_version; /* vkd3d version if engine_name is NULL */ + /** + * The engine name, to be passed to the Vulkan implementation. If it is NULL, "vkd3d" is used. + */ + const char *engine_name; + /** + * The engine version, to be passed to the Vulkan implementation. If it is 0, the version is + * computed from the vkd3d library version. + */ + uint32_t engine_version; + /** + * The vkd3d API version to use, to guarantee backward compatibility of the shared library. If + * this chained structure is not used then VKD3D_API_VERSION_1_0 is used. + */ enum vkd3d_api_version api_version; };

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic OutputControlPointID.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 079f8e4d52b35152e09a367310e47673d40301ea URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/079f8e4d52b35152e09a367310e47… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:54:52 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic OutputControlPointID. --- libs/vkd3d-shader/dxil.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 7d59708c..d07d5ade 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -423,6 +423,7 @@ enum dx_intrinsic_opcode DX_LOAD_PATCH_CONSTANT = 104, DX_DOMAIN_LOCATION = 105, DX_STORE_PATCH_CONSTANT = 106, + DX_OUTPUT_CONTROL_POINT_ID = 107, DX_PRIMITIVE_ID = 108, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -5149,6 +5150,12 @@ static void sm6_parser_emit_dx_make_double(struct sm6_parser *sm6, enum dx_intri instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_output_control_point_id(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + sm6_parser_emit_dx_input_register_mov(sm6, state->ins, VKD3DSPR_OUTPOINTID, VKD3D_DATA_UINT); +} + static void sm6_parser_emit_dx_primitive_id(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5880,6 +5887,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LOAD_PATCH_CONSTANT ] = {"o", "ii8", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_MAKE_DOUBLE ] = {"d", "ii", sm6_parser_emit_dx_make_double}, + [DX_OUTPUT_CONTROL_POINT_ID ] = {"i", "", sm6_parser_emit_dx_output_control_point_id}, [DX_PRIMITIVE_ID ] = {"i", "", sm6_parser_emit_dx_primitive_id}, [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_RAW_BUFFER_STORE ] = {"v", "Hiioooocc", sm6_parser_emit_dx_raw_buffer_store},

1 0

Giovanni Mascellani : tests: Allow compiling shaders with DXC on crosstests.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 09630ada901ee356f2fec2c519ce0a71259ba225 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09630ada901ee356f2fec2c519ce0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 23 13:58:02 2024 +0100 tests: Allow compiling shaders with DXC on crosstests. This is currently disabled on the CI because dxcompiler.dll is not available. --- gitlab/test.yml | 2 ++ tests/shader_runner.c | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/gitlab/test.yml b/gitlab/test.yml index 65a75d0e..a25918dc 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -19,8 +19,10 @@ test-win-64: extends: .test-win variables: TEST_ARCH: "64" + VKD3D_TESTS_SKIP_DXC: "1" test-win-32: extends: .test-win variables: TEST_ARCH: "32" + VKD3D_TESTS_SKIP_DXC: "1" diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 4a44e3c9..a639d716 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2083,7 +2083,7 @@ out: } #endif -#if defined(SONAME_LIBDXCOMPILER) && !defined(VKD3D_CROSSTEST) +#if (defined(SONAME_LIBDXCOMPILER) || defined(VKD3D_CROSSTEST)) static IDxcCompiler3 *dxcompiler_create(void) { DxcCreateInstanceProc create_instance; @@ -2095,7 +2095,11 @@ static IDxcCompiler3 *dxcompiler_create(void) if ((skip_dxc = getenv("VKD3D_TESTS_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) return NULL; +#ifdef VKD3D_CROSSTEST + dll = vkd3d_dlopen("dxcompiler.dll"); +#else dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER); +#endif ok(dll, "Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); if (!dll) return NULL; @@ -2112,7 +2116,7 @@ static IDxcCompiler3 *dxcompiler_create(void) return compiler; } -#elif !defined(VKD3D_CROSSTEST) +#else static IDxcCompiler3 *dxcompiler_create(void) { return NULL; @@ -2121,9 +2125,7 @@ static IDxcCompiler3 *dxcompiler_create(void) START_TEST(shader_runner) { -#ifndef VKD3D_CROSSTEST IDxcCompiler3 *dxc_compiler; -#endif parse_args(argc, argv); @@ -2134,7 +2136,14 @@ START_TEST(shader_runner) run_shader_tests_d3d11(); - run_shader_tests_d3d12(NULL); + dxc_compiler = dxcompiler_create(); + run_shader_tests_d3d12(dxc_compiler); + + if (dxc_compiler) + { + IDxcCompiler3_Release(dxc_compiler); + print_dll_version("dxcompiler.dll"); + } print_dll_version("d3dcompiler_47.dll"); print_dll_version("dxgi.dll");

1 0

Giovanni Mascellani : tests: Allow skipping DXC tests at runtime.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 53fd1a95fc53b78b8e60c1bb26560c2401999c9a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/53fd1a95fc53b78b8e60c1bb26560… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 20 14:12:19 2024 +0200 tests: Allow skipping DXC tests at runtime. --- tests/shader_runner.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f3b6972f..4a44e3c9 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2088,9 +2088,13 @@ static IDxcCompiler3 *dxcompiler_create(void) { DxcCreateInstanceProc create_instance; IDxcCompiler3 *compiler; + const char *skip_dxc; HRESULT hr; void *dll; + if ((skip_dxc = getenv("VKD3D_TESTS_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) + return NULL; + dll = vkd3d_dlopen(SONAME_LIBDXCOMPILER); ok(dll, "Failed to load dxcompiler library, %s.\n", vkd3d_dlerror()); if (!dll)

1 0