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

Henri Verbeet : vkd3d-shader: Pass a struct vsir_program to vkd3d_shader_parser_compile().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 592e902d47921db9f1386b461cc9796e258d077a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/592e902d47921db9f1386b461cc97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 23:51:54 2024 +0200 vkd3d-shader: Pass a struct vsir_program to vkd3d_shader_parser_compile(). --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 5edebb60..0b48b17d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3976,7 +3976,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d } if (ret >= 0) { - ret = vkd3d_shader_parser_compile(parser, &info, out, message_context); + ret = vsir_program_compile(&parser->program, parser->config_flags, &info, out, message_context); vkd3d_shader_parser_destroy(parser); } vkd3d_shader_free_shader_code(&info.source); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index d58a19a2..a7b42217 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1556,13 +1556,11 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char return ret; } -int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) +int vsir_program_compile(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, + struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_scan_descriptor_info1 scan_descriptor_info; - struct vsir_program *program = &parser->program; - uint64_t config_flags = parser->config_flags; struct vkd3d_shader_compile_info scan_info; int ret; @@ -1667,7 +1665,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } else { - ret = vkd3d_shader_parser_compile(parser, compile_info, out, &message_context); + ret = vsir_program_compile(&parser->program, parser->config_flags, compile_info, out, &message_context); vkd3d_shader_parser_destroy(parser); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 79a69daf..04344586 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1345,8 +1345,11 @@ struct vsir_program size_t block_name_count; }; -bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve); void vsir_program_cleanup(struct vsir_program *program); +int vsir_program_compile(struct vsir_program *program, uint64_t config_flags, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, + struct vkd3d_shader_message_context *message_context); +bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve); enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context); enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t config_flags, @@ -1381,9 +1384,6 @@ struct vkd3d_shader_parser_ops void (*parser_destroy)(struct vkd3d_shader_parser *parser); }; -int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, - struct vkd3d_shader_message_context *message_context); void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser,

1 0

Henri Verbeet : tests/shader_runner: Get rid of some redundant "| glsl" conditions.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 62a512c4f8c4070f0f4f3ed8e70b6f0bc885da30 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62a512c4f8c4070f0f4f3ed8e70b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:11:57 2024 +0200 tests/shader_runner: Get rid of some redundant "| glsl" conditions. We don't run shader model 6 GLSL tests. --- tests/hlsl/calculate-lod.shader_test | 8 ++++---- tests/hlsl/depth-out.shader_test | 10 +++++----- tests/hlsl/get-sample-pos.shader_test | 2 +- tests/hlsl/refract.shader_test | 2 +- tests/hlsl/rt-get-sample-info.shader_test | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/hlsl/calculate-lod.shader_test b/tests/hlsl/calculate-lod.shader_test index 74533cfe..69587a18 100644 --- a/tests/hlsl/calculate-lod.shader_test +++ b/tests/hlsl/calculate-lod.shader_test @@ -33,7 +33,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (2.0, 1.0, 0.0, 14.0) @@ -50,7 +50,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (2.0, 2.0, 0.0, 0.0) @@ -67,7 +67,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (2.0, 1.0, 0.0, 14.0) @@ -84,5 +84,5 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (45.0, 50.0, -14.0, -47.0) diff --git a/tests/hlsl/depth-out.shader_test b/tests/hlsl/depth-out.shader_test index 3a99a0f0..282ec5a8 100644 --- a/tests/hlsl/depth-out.shader_test +++ b/tests/hlsl/depth-out.shader_test @@ -65,14 +65,14 @@ uniform 0 float4 0.75 0.75 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 depth greater equal -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe dsv all r (0.75) uniform 0 float4 0.75 0.375 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) probe dsv all r (0.5) @@ -91,20 +91,20 @@ uniform 0 float4 0.75 0.75 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 depth greater equal -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe dsv all r (0.75) uniform 0 float4 0.375 0.625 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (0.0, 1.0, 0.0, 1.0) probe dsv all r (0.625) uniform 0 float4 0.375 0.375 0.0 0.0 clear rtv 0 1.0 1.0 1.0 1.0 clear dsv 0.5 -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) probe dsv all r (0.5) diff --git a/tests/hlsl/get-sample-pos.shader_test b/tests/hlsl/get-sample-pos.shader_test index 69b9101b..3fcf6b97 100644 --- a/tests/hlsl/get-sample-pos.shader_test +++ b/tests/hlsl/get-sample-pos.shader_test @@ -15,5 +15,5 @@ float4 main() : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (-0.125, -0.375, 0.375, -0.125) diff --git a/tests/hlsl/refract.shader_test b/tests/hlsl/refract.shader_test index 53af811f..f123cd44 100644 --- a/tests/hlsl/refract.shader_test +++ b/tests/hlsl/refract.shader_test @@ -228,6 +228,6 @@ float4 main() : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad if(sm<6) probe all rgba (2.0, 1.0, 1.0, 1.0) if(sm>=6) probe all rgba (1.0, 1.0, 1.0, 1.0) diff --git a/tests/hlsl/rt-get-sample-info.shader_test b/tests/hlsl/rt-get-sample-info.shader_test index eea4f1a4..9c4ea2fb 100644 --- a/tests/hlsl/rt-get-sample-info.shader_test +++ b/tests/hlsl/rt-get-sample-info.shader_test @@ -13,7 +13,7 @@ float4 main() : sv_target } [test] -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (4.0, 0.0, 0.0, 0.0) @@ -27,8 +27,8 @@ float4 main() : sv_target [test] uniform 0 uint 0 -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (-0.125, -0.375, 0.375, -0.125) uniform 0 uint 2 -todo(sm<6 | glsl) draw quad +todo(sm<6) draw quad probe all rgba (-0.375, 0.125, 0.125, 0.375)

1 0

Henri Verbeet : vkd3d-shader: Pass a struct vsir_program to scan_with_parser().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: fa7b623eac20d9c606864491a5704e44e17bbbd9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa7b623eac20d9c606864491a5704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 23:41:40 2024 +0200 vkd3d-shader: Pass a struct vsir_program to scan_with_parser(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 71c04bc1..d58a19a2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1395,15 +1395,14 @@ static void vkd3d_shader_free_scan_descriptor_info1(struct vkd3d_shader_scan_des vkd3d_free(scan_descriptor_info->descriptors); } -static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info, +static int vsir_program_scan(struct vsir_program *program, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context, - struct vkd3d_shader_scan_descriptor_info1 *descriptor_info1, struct vkd3d_shader_parser *parser) + struct vkd3d_shader_scan_descriptor_info1 *descriptor_info1) { struct vkd3d_shader_scan_combined_resource_sampler_info *combined_sampler_info; struct vkd3d_shader_scan_descriptor_info1 local_descriptor_info1 = {0}; struct vkd3d_shader_scan_descriptor_info *descriptor_info; struct vkd3d_shader_scan_signature_info *signature_info; - struct vsir_program *program = &parser->program; struct vkd3d_shader_instruction *instruction; struct vkd3d_shader_scan_context context; int ret = VKD3D_OK; @@ -1545,7 +1544,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char } else { - ret = scan_with_parser(compile_info, &message_context, NULL, parser); + ret = vsir_program_scan(&parser->program, compile_info, &message_context, NULL); vkd3d_shader_parser_destroy(parser); } } @@ -1576,7 +1575,7 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, break; case VKD3D_SHADER_TARGET_GLSL: - if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) + if ((ret = vsir_program_scan(program, &scan_info, message_context, &scan_descriptor_info)) < 0) return ret; ret = glsl_compile(program, config_flags, compile_info, out, message_context); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); @@ -1584,7 +1583,7 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, case VKD3D_SHADER_TARGET_SPIRV_BINARY: case VKD3D_SHADER_TARGET_SPIRV_TEXT: - if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) + if ((ret = vsir_program_scan(program, &scan_info, message_context, &scan_descriptor_info)) < 0) return ret; ret = spirv_compile(program, config_flags, &scan_descriptor_info, compile_info, out, message_context);

1 0

Giovanni Mascellani : include: Document structure vkd3d_device_create_info.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 2b1abc5d7bd9c4053d321e999c98d129ad708659 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2b1abc5d7bd9c4053d321e999c98d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 19:42:14 2024 +0200 include: Document structure vkd3d_device_create_info. --- include/vkd3d.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index c350c5ea..b8584b68 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -237,22 +237,56 @@ struct vkd3d_host_time_domain_info uint64_t ticks_per_second; }; +/** + * A chained structure containing device creation parameters. + */ struct vkd3d_device_create_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** The minimum feature level to request. Device creation will fail with E_INVALIDARG if the + * Vulkan device doesn't have the features needed to fulfill the request. */ D3D_FEATURE_LEVEL minimum_feature_level; + /** + * The vkd3d instance to use to create a device. Either this or instance_create_info must be + * set. + */ struct vkd3d_instance *instance; + /** + * The parameters used to create an instance, which is then used to create a device. Either + * this or instance must be set. + */ const struct vkd3d_instance_create_info *instance_create_info; + /** + * The Vulkan physical device to use. If it is NULL, the first physical device found is used, + * prioritizing discrete GPUs over integrated GPUs and integrated GPUs over all the others. + * + * This parameter can be overridden by setting environment variable VKD3D_VULKAN_DEVICE. + */ VkPhysicalDevice vk_physical_device; + /** + * A list of Vulkan device extensions to request. They are intended as required, so device + * creation will fail if any of them is not available. + */ const char * const *device_extensions; + /** The number of elements in the device_extensions array. */ uint32_t device_extension_count; + /** + * An object to be set as the device parent. This is not used by vkd3d except for being + * returned by vkd3d_get_device_parent. + */ IUnknown *parent; + /** + * The adapter LUID to be set for the device. This is not used by vkd3d except for being + * returned by GetAdapterLuid. + */ LUID adapter_luid; };

1 0

Giovanni Mascellani : include: Document structure vkd3d_optional_device_extensions_info.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 2679b10fcbd041460baeb4ef9de05d82eb4b4e3c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2679b10fcbd041460baeb4ef9de05… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 19:45:49 2024 +0200 include: Document structure vkd3d_optional_device_extensions_info. --- include/vkd3d.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index b8584b68..6b44b3c8 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -290,13 +290,26 @@ struct vkd3d_device_create_info LUID adapter_luid; }; -/* Extends vkd3d_device_create_info. Available since 1.2. */ +/** + * A chained structure to specify optional device extensions. + * + * This structure extends vkd3d_device_create_info. + * + * \since 1.2 + */ struct vkd3d_optional_device_extensions_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * A list of optional Vulkan device extensions to request. Device 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

Henri Verbeet : vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compiler_generate_spirv().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: e21215f4667918381cdbdfab29db5f88dc155940 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e21215f4667918381cdbdfab29db5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 21:45:54 2024 +0200 vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compiler_generate_spirv(). --- libs/vkd3d-shader/spirv.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0a52e1a7..2b630425 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -10238,15 +10238,13 @@ static void spirv_compiler_emit_descriptor_declarations(struct spirv_compiler *c } } -static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_parser *parser, - struct vkd3d_shader_code *spirv) +static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct vsir_program *program, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) { const struct vkd3d_shader_spirv_target_info *info = compiler->spirv_target_info; const struct vkd3d_shader_spirv_domain_shader_target_info *ds_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_instruction_array instructions; - struct vsir_program *program = &parser->program; enum vkd3d_shader_spirv_environment environment; enum vkd3d_result result = VKD3D_OK; unsigned int i; @@ -10332,7 +10330,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (!vkd3d_spirv_compile_module(builder, spirv, spirv_compiler_get_entry_point_name(compiler), environment)) return VKD3D_ERROR; - if (TRACE_ON() || parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION) + if (TRACE_ON() || compiler->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION) { struct vkd3d_string_buffer buffer; @@ -10375,17 +10373,18 @@ int spirv_compile(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { + struct vsir_program *program = &parser->program; struct spirv_compiler *spirv_compiler; int ret; - if (!(spirv_compiler = spirv_compiler_create(&parser->program, compile_info, + if (!(spirv_compiler = spirv_compiler_create(program, compile_info, scan_descriptor_info, message_context, parser->config_flags))) { ERR("Failed to create SPIR-V compiler.\n"); return VKD3D_ERROR; } - ret = spirv_compiler_generate_spirv(spirv_compiler, compile_info, parser, out); + ret = spirv_compiler_generate_spirv(spirv_compiler, program, compile_info, out); spirv_compiler_destroy(spirv_compiler); return ret;

1 0

Henri Verbeet : vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compile().
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: f94852050447920d227d105442f011bf9e78fc53 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f94852050447920d227d105442f01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 22:14:18 2024 +0200 vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compile(). --- libs/vkd3d-shader/spirv.c | 5 ++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2b630425..d50288c0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -10368,17 +10368,16 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct return VKD3D_OK; } -int spirv_compile(struct vkd3d_shader_parser *parser, +int spirv_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { - struct vsir_program *program = &parser->program; struct spirv_compiler *spirv_compiler; int ret; if (!(spirv_compiler = spirv_compiler_create(program, compile_info, - scan_descriptor_info, message_context, parser->config_flags))) + scan_descriptor_info, message_context, config_flags))) { ERR("Failed to create SPIR-V compiler.\n"); return VKD3D_ERROR; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0d3bf891..71c04bc1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1563,6 +1563,7 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, { struct vkd3d_shader_scan_descriptor_info1 scan_descriptor_info; struct vsir_program *program = &parser->program; + uint64_t config_flags = parser->config_flags; struct vkd3d_shader_compile_info scan_info; int ret; @@ -1577,7 +1578,7 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, case VKD3D_SHADER_TARGET_GLSL: if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) return ret; - ret = glsl_compile(program, parser->config_flags, compile_info, out, message_context); + ret = glsl_compile(program, config_flags, compile_info, out, message_context); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); break; @@ -1585,7 +1586,8 @@ int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, case VKD3D_SHADER_TARGET_SPIRV_TEXT: if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) return ret; - ret = spirv_compile(parser, &scan_descriptor_info, compile_info, out, message_context); + ret = spirv_compile(program, config_flags, &scan_descriptor_info, + compile_info, out, message_context); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b0e52a33..79a69daf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1555,7 +1555,7 @@ int glsl_compile(struct vsir_program *program, uint64_t config_flags, #define SPIRV_MAX_SRC_COUNT 6 -int spirv_compile(struct vkd3d_shader_parser *parser, +int spirv_compile(struct vsir_program *program, uint64_t config_flags, const struct vkd3d_shader_scan_descriptor_info1 *scan_descriptor_info, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context);

1 0

Giovanni Mascellani : vkd3d: Simplify control flow for swapchain images.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 5d78eeb6d35b9ab424ab0b8d63aa61c372542b5f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d78eeb6d35b9ab424ab0b8d63aa6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 1 15:35:08 2024 +0200 vkd3d: Simplify control flow for swapchain images. --- libs/vkd3d/command.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4a69ff53..95366d34 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2052,20 +2052,15 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - if (resource->present_state == D3D12_RESOURCE_STATE_PRESENT) - { - *access_mask = VK_ACCESS_MEMORY_READ_BIT; - *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; - return true; - } - else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) - { - vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, + if (resource->present_state != D3D12_RESOURCE_STATE_PRESENT) + return vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); - return true; - } + + *access_mask = VK_ACCESS_MEMORY_READ_BIT; + *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + return true; } *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT;

1 0

Giovanni Mascellani : include: Document structure vkd3d_image_resource_create_info.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: vkd3d Branch: master Commit: 3f43d06f5c67d4753100e0897bc2cc5f7c61f502 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3f43d06f5c67d4753100e0897bc2c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 21:58:02 2024 +0200 include: Document structure vkd3d_image_resource_create_info. --- include/vkd3d.h | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 6b44b3c8..7f585aa2 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -313,18 +313,58 @@ struct vkd3d_optional_device_extensions_info uint32_t extension_count; }; -/* vkd3d_image_resource_create_info flags */ +/** + * When specified as a flag of vkd3d_image_resource_create_info, it means that vkd3d will do the + * initial transition operation on the image from VK_IMAGE_LAYOUT_UNDEFINED to its appropriate + * Vulkan layout (depending on its D3D12 resource state). If this flag is not specified the caller + * is responsible for transitioning the Vulkan image to the appropriate layout. + */ #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 +/** + * When specified as a flag of vkd3d_image_resource_create_info, it means that field present_state + * is honored. + */ #define VKD3D_RESOURCE_PRESENT_STATE_TRANSITION 0x00000002 +/** + * A chained structure containing the parameters to create a D3D12 resource backed by a Vulkan + * image. + */ struct vkd3d_image_resource_create_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** The Vulkan image that backs the resource. */ VkImage vk_image; + /** The resource description. */ D3D12_RESOURCE_DESC desc; + /** + * A combination of zero or more flags. The valid flags are + * VKD3D_RESOURCE_INITIAL_STATE_TRANSITION and VKD3D_RESOURCE_PRESENT_STATE_TRANSITION. + */ unsigned int flags; + /** + * This field specifies how to handle resource state D3D12_RESOURCE_STATE_PRESENT for + * the resource. Notice that on D3D12 there is no difference between + * D3D12_RESOURCE_STATE_COMMON and D3D12_RESOURCE_STATE_PRESENT (they have the same value), + * while on Vulkan two different layouts are used (VK_IMAGE_LAYOUT_GENERAL and + * VK_IMAGE_LAYOUT_PRESENT_SRC_KHR). + * + * * When flag VKD3D_RESOURCE_PRESENT_STATE_TRANSITION is not specified, field + * present_state is ignored and resource state D3D12_RESOURCE_STATE_COMMON/_PRESENT is + * mapped to VK_IMAGE_LAYOUT_GENERAL; this is useful for non-swapchain resources. + * * Otherwise, when present_state is D3D12_RESOURCE_STATE_PRESENT/_COMMON, resource state + * D3D12_RESOURCE_STATE_COMMON/_PRESENT is mapped to VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + * this is useful for swapchain resources that are directly backed by a Vulkan swapchain + * image. + * * Otherwise, resource state D3D12_RESOURCE_STATE_COMMON/_PRESENT is treated as resource + * state present_state; this is useful for swapchain resources that backed by a Vulkan + * non-swapchain image, which the client will likely consume with a copy or drawing + * operation at presentation time. + */ D3D12_RESOURCE_STATES present_state; };

1 0

Alistair Leslie-Hughes : windowscodecs: Avoid implicit cast changing value.
by Alexandre Julliard May 2, 2024

May 2, 2024

Module: wine Branch: master Commit: 013f54af1f721dce651c85f87a5339ba3cb9d4a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/013f54af1f721dce651c85f87a5339… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 2 09:55:01 2024 +1000 windowscodecs: Avoid implicit cast changing value. This appear to be introduced with commit 12f73ed9d851. When This->stride is negative (bottom up image) it converts the multiplication to an UINT. Thus causing the pointer to be incorrect when y > 0. --- dlls/windowscodecs/bmpdecode.c | 2 +- dlls/windowscodecs/wincodecs_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 9d4867447f0..ae6feda5b50 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -432,7 +432,7 @@ static HRESULT BmpFrameDecode_ReadABGRasBGR(BmpDecoder* This) { for (y = 0; y < height; y++) { - pixel = This->imagedatastart + This->stride * y; + pixel = This->imagedatastart + This->stride * (INT)y; for (x = 0; x < width; x++) { diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index f56e91e1f54..dcccdc2e5f1 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -201,7 +201,7 @@ void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT for (y=0; y<height; y++) { - pixel = bits + stride * y; + pixel = bits + stride * (INT)y; for (x=0; x<width; x++) {

1 0