- Wine-Commits - list.winehq.org

Alexandre Julliard : png: Import upstream release 1.6.43.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: ff77a49a5e4aa63b722fbe9d4dc941ccbd02cb42 URL: https://gitlab.winehq.org/wine/wine/-/commit/ff77a49a5e4aa63b722fbe9d4dc941… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 21:34:34 2024 +0200 png: Import upstream release 1.6.43. --- libs/png/AUTHORS | 1 + libs/png/png.c | 41 +++++++++++++++++++---------------------- libs/png/png.h | 25 ++++++++++++------------- libs/png/pngconf.h | 2 +- libs/png/pnglibconf.h | 2 +- libs/png/pngread.c | 6 +++++- libs/png/pngrtran.c | 28 ++++++++++++---------------- 7 files changed, 51 insertions(+), 54 deletions(-)

1 0

Piotr Caban : winhttp: Use GlobalAlloc to allocate lpszProxy in WinHttpGetProxyForUrl.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: 9312c453785ebf3885723979aa6c60010787f66e URL: https://gitlab.winehq.org/wine/wine/-/commit/9312c453785ebf3885723979aa6c60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 14:50:58 2024 +0200 winhttp: Use GlobalAlloc to allocate lpszProxy in WinHttpGetProxyForUrl. --- dlls/winhttp/session.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 7860bf757f4..74c8d973f35 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1896,7 +1896,17 @@ static BOOL parse_script_result( const char *result, WINHTTP_PROXY_INFO *info ) p += 5; while (*p == ' ') p++; if (!*p || *p == ';') return TRUE; - if (!(info->lpszProxy = q = strdupAW( p ))) return FALSE; + if (!(q = strdupAW( p ))) return FALSE; + len = wcslen( q ); + info->lpszProxy = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ); + if (!info->lpszProxy) + { + free( q ); + return FALSE; + } + memcpy( info->lpszProxy, q, (len + 1) * sizeof(WCHAR) ); + free( q ); + q = info->lpszProxy; info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; for (; *q; q++) {

1 0

Alexandre Julliard : fluidsynth: Import upstream release 2.3.5.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: 80f6d511a1a0af3764c05c26039f2ade86301a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/80f6d511a1a0af3764c05c26039f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 21:28:39 2024 +0200 fluidsynth: Import upstream release 2.3.5. --- libs/fluidsynth/include/fluidsynth/version.h | 4 ++-- libs/fluidsynth/src/midi/fluid_midi.c | 2 +- libs/fluidsynth/src/synth/fluid_chan.c | 2 +- libs/fluidsynth/src/synth/fluid_synth.c | 18 +++++++++--------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/fluidsynth/include/fluidsynth/version.h b/libs/fluidsynth/include/fluidsynth/version.h index 96ee8183bd3..91fa462fc8c 100644 --- a/libs/fluidsynth/include/fluidsynth/version.h +++ b/libs/fluidsynth/include/fluidsynth/version.h @@ -31,10 +31,10 @@ extern "C" { * * @{ */ -#define FLUIDSYNTH_VERSION "2.3.4" /**< String constant of libfluidsynth version. */ +#define FLUIDSYNTH_VERSION "2.3.5" /**< String constant of libfluidsynth version. */ #define FLUIDSYNTH_VERSION_MAJOR 2 /**< libfluidsynth major version integer constant. */ #define FLUIDSYNTH_VERSION_MINOR 3 /**< libfluidsynth minor version integer constant. */ -#define FLUIDSYNTH_VERSION_MICRO 4 /**< libfluidsynth micro version integer constant. */ +#define FLUIDSYNTH_VERSION_MICRO 5 /**< libfluidsynth micro version integer constant. */ FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro); FLUIDSYNTH_API char* fluid_version_str(void); diff --git a/libs/fluidsynth/src/midi/fluid_midi.c b/libs/fluidsynth/src/midi/fluid_midi.c index dc6f0b865f3..4435efc5dcf 100644 --- a/libs/fluidsynth/src/midi/fluid_midi.c +++ b/libs/fluidsynth/src/midi/fluid_midi.c @@ -1644,7 +1644,7 @@ fluid_player_handle_reset_synth(void *data, const char *name, int value) static int check_for_on_notes(fluid_synth_t *synth) { fluid_voice_t* v[1024]; - int i, res=FALSE; + unsigned int i, res=FALSE; fluid_synth_get_voicelist(synth, v, FLUID_N_ELEMENTS(v), -1); for(i=0; i<FLUID_N_ELEMENTS(v) && v[i] != NULL; i++) { diff --git a/libs/fluidsynth/src/synth/fluid_chan.c b/libs/fluidsynth/src/synth/fluid_chan.c index 0f2eecb44e0..84ca446b783 100644 --- a/libs/fluidsynth/src/synth/fluid_chan.c +++ b/libs/fluidsynth/src/synth/fluid_chan.c @@ -325,7 +325,7 @@ fluid_channel_set_bank_msb(fluid_channel_t *chan, int bankmsb) /* XG bank, do drum-channel auto-switch */ /* The number "120" was based on several keyboards having drums at 120 - 127, reference: https://lists.nongnu.org/archive/html/fluid-dev/2011-02/msg00003.html */ - chan->channel_type = (120 <= bankmsb) ? CHANNEL_TYPE_DRUM : CHANNEL_TYPE_MELODIC; + chan->channel_type = (120 == bankmsb || 126 == bankmsb || 127 == bankmsb) ? CHANNEL_TYPE_DRUM : CHANNEL_TYPE_MELODIC; return; } diff --git a/libs/fluidsynth/src/synth/fluid_synth.c b/libs/fluidsynth/src/synth/fluid_synth.c index 0580ed271f6..93858173112 100644 --- a/libs/fluidsynth/src/synth/fluid_synth.c +++ b/libs/fluidsynth/src/synth/fluid_synth.c @@ -202,16 +202,16 @@ void fluid_synth_settings(fluid_settings_t *settings) fluid_settings_register_int(settings, "synth.verbose", 0, 0, 1, FLUID_HINT_TOGGLED); fluid_settings_register_int(settings, "synth.reverb.active", 1, 0, 1, FLUID_HINT_TOGGLED); - fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0f, 1.0f, 0); - fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0f, 1.0f, 0); - fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0f, 100.0f, 0); - fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0f, 1.0f, 0); + fluid_settings_register_num(settings, "synth.reverb.room-size", FLUID_REVERB_DEFAULT_ROOMSIZE, 0.0, 1.0, 0); + fluid_settings_register_num(settings, "synth.reverb.damp", FLUID_REVERB_DEFAULT_DAMP, 0.0, 1.0, 0); + fluid_settings_register_num(settings, "synth.reverb.width", FLUID_REVERB_DEFAULT_WIDTH, 0.0, 100.0, 0); + fluid_settings_register_num(settings, "synth.reverb.level", FLUID_REVERB_DEFAULT_LEVEL, 0.0, 1.0, 0); fluid_settings_register_int(settings, "synth.chorus.active", 1, 0, 1, FLUID_HINT_TOGGLED); fluid_settings_register_int(settings, "synth.chorus.nr", FLUID_CHORUS_DEFAULT_N, 0, 99, 0); - fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0f, 10.0f, 0); - fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.1f, 5.0f, 0); - fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0f, 256.0f, 0); + fluid_settings_register_num(settings, "synth.chorus.level", FLUID_CHORUS_DEFAULT_LEVEL, 0.0, 10.0, 0); + fluid_settings_register_num(settings, "synth.chorus.speed", FLUID_CHORUS_DEFAULT_SPEED, 0.1, 5.0, 0); + fluid_settings_register_num(settings, "synth.chorus.depth", FLUID_CHORUS_DEFAULT_DEPTH, 0.0, 256.0, 0); fluid_settings_register_int(settings, "synth.ladspa.active", 0, 0, 1, FLUID_HINT_TOGGLED); fluid_settings_register_int(settings, "synth.lock-memory", 1, 0, 1, FLUID_HINT_TOGGLED); @@ -223,12 +223,12 @@ void fluid_synth_settings(fluid_settings_t *settings) fluid_settings_register_int(settings, "synth.polyphony", 256, 1, 65535, 0); fluid_settings_register_int(settings, "synth.midi-channels", 16, 16, 256, 0); - fluid_settings_register_num(settings, "synth.gain", 0.2f, 0.0f, 10.0f, 0); + fluid_settings_register_num(settings, "synth.gain", 0.2, 0.0, 10.0, 0); fluid_settings_register_int(settings, "synth.audio-channels", 1, 1, 128, 0); fluid_settings_register_int(settings, "synth.audio-groups", 1, 1, 128, 0); fluid_settings_register_int(settings, "synth.effects-channels", 2, 2, 2, 0); fluid_settings_register_int(settings, "synth.effects-groups", 1, 1, 128, 0); - fluid_settings_register_num(settings, "synth.sample-rate", 44100.0f, 8000.0f, 96000.0f, 0); + fluid_settings_register_num(settings, "synth.sample-rate", 44100.0, 8000.0, 96000.0, 0); fluid_settings_register_int(settings, "synth.device-id", 0, 0, 127, 0); #ifdef ENABLE_MIXER_THREADS fluid_settings_register_int(settings, "synth.cpu-cores", 1, 1, 256, 0);

1 0

Brendan Shanks : winemac.drv: Fix use-after-free in macdrv_copy_pasteboard_types.
by Alexandre Julliard May 3, 2024

May 3, 2024

Module: wine Branch: master Commit: 17cbc13b90e276465e0e56c58f885790b951a19a URL: https://gitlab.winehq.org/wine/wine/-/commit/17cbc13b90e276465e0e56c58f8857… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 2 16:02:24 2024 -0700 winemac.drv: Fix use-after-free in macdrv_copy_pasteboard_types. Fixes a regression from bb2e02ab66c5c602d635722cf3a5820d6b366006. --- dlls/winemac.drv/cocoa_clipboard.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index a3dca323705..4994442f1df 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -103,6 +103,7 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) @"com.compuserve.gif" : @(NSBitmapImageFileTypeGIF), @"public.jpeg" : @(NSBitmapImageFileTypeJPEG), }; + [BitmapOutputTypeMap retain]; }); OnMainThread(^{

1 0

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