February 2023 - Wine-Commits

Hans Leidekker : wpcap: Make Unix call parameters wow64 compatible.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: e702266e14688ebff82f46d415684502bec1a44f URL: https://gitlab.winehq.org/wine/wine/-/commit/e702266e14688ebff82f46d4156845… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 14:31:56 2023 +0100 wpcap: Make Unix call parameters wow64 compatible. --- dlls/wpcap/unixlib.c | 281 ++++++++++------- dlls/wpcap/unixlib.h | 166 ++++++---- dlls/wpcap/wpcap.c | 870 ++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 966 insertions(+), 351 deletions(-)

1 0

Hans Leidekker : wpcap: Implement pcap_dump_close().
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: c589e978a7919f10bcf1150c98272db057255596 URL: https://gitlab.winehq.org/wine/wine/-/commit/c589e978a7919f10bcf1150c98272d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:47:16 2023 +0100 wpcap: Implement pcap_dump_close(). --- dlls/wpcap/unixlib.c | 8 ++++++++ dlls/wpcap/unixlib.h | 6 ++++++ dlls/wpcap/wpcap.c | 12 ++++++++++++ dlls/wpcap/wpcap.spec | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index ed753c0d6fd..49232c4c444 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -155,6 +155,13 @@ static NTSTATUS wrap_dump( void *args ) return STATUS_SUCCESS; } +static NTSTATUS wrap_dump_close( void *args ) +{ + const struct dump_close_params *params = args; + pcap_dump_close( (pcap_dumper_t *)(ULONG_PTR)params->handle ); + return STATUS_SUCCESS; +} + static NTSTATUS wrap_dump_open( void *args ) { const struct dump_open_params *params = args; @@ -452,6 +459,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = wrap_datalink_val_to_description, wrap_datalink_val_to_name, wrap_dump, + wrap_dump_close, wrap_dump_open, wrap_findalldevs, wrap_get_tstamp_precision, diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 740be3ad12e..3adb8f1f61d 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -138,6 +138,11 @@ struct dump_params const unsigned char *packet; }; +struct dump_close_params +{ + UINT64 handle; +}; + struct dump_open_params { UINT64 handle; @@ -337,6 +342,7 @@ enum pcap_funcs unix_datalink_val_to_description, unix_datalink_val_to_name, unix_dump, + unix_dump_close, unix_dump_open, unix_findalldevs, unix_get_tstamp_precision, diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f3b203f983d..afb47a58a90 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -301,6 +301,18 @@ struct dumper UINT64 handle; }; +void CDECL pcap_dump_close( struct dumper *dumper ) +{ + struct dump_close_params params; + + TRACE( "%p\n", dumper ); + + if (!dumper) return; + params.handle = dumper->handle; + PCAP_CALL( dump, &params ); + free( dumper ); +} + static inline WCHAR *strdup_from_utf8( const char *str ) { WCHAR *ret = NULL; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 7a59dda3caf..b3685d098fe 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -20,7 +20,7 @@ @ cdecl pcap_datalink_val_to_name(long) @ cdecl pcap_dispatch(ptr long ptr ptr) @ cdecl pcap_dump(ptr ptr str) -@ stub pcap_dump_close +@ cdecl pcap_dump_close(ptr) @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell

1 0

Hans Leidekker : wpcap: Implement pcap_bufsize().
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 82ed15f97599a09ec35658f770fbf6f740ffa4d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/82ed15f97599a09ec35658f770fbf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:40:49 2023 +0100 wpcap: Implement pcap_bufsize(). --- dlls/wpcap/unixlib.c | 7 +++++++ dlls/wpcap/unixlib.h | 6 ++++++ dlls/wpcap/wpcap.c | 11 +++++++++++ dlls/wpcap/wpcap.spec | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index c65a13a1c15..ed753c0d6fd 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -55,6 +55,12 @@ static NTSTATUS wrap_breakloop( void *args ) return STATUS_SUCCESS; } +static NTSTATUS wrap_bufsize( void *args ) +{ + const struct bufsize_params *params = args; + return pcap_bufsize( (pcap_t *)(ULONG_PTR)params->handle ); +} + static NTSTATUS wrap_can_set_rfmon( void *args ) { const struct can_set_rfmon_params *params = args; @@ -436,6 +442,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = { wrap_activate, wrap_breakloop, + wrap_bufsize, wrap_can_set_rfmon, wrap_close, wrap_compile, diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index 403158af978..740be3ad12e 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -75,6 +75,11 @@ struct breakloop_params UINT64 handle; }; +struct bufsize_params +{ + UINT64 handle; +}; + struct can_set_rfmon_params { UINT64 handle; @@ -322,6 +327,7 @@ enum pcap_funcs { unix_activate, unix_breakloop, + unix_bufsize, unix_can_set_rfmon, unix_close, unix_compile, diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5c25e4a2708..f3b203f983d 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -108,6 +108,17 @@ void CDECL pcap_breakloop( struct pcap *pcap ) PCAP_CALL( breakloop, &params ); } +int CDECL pcap_bufsize( struct pcap *pcap ) +{ + struct bufsize_params params; + + TRACE( "%p\n", pcap ); + + if (!pcap) return 0; + params.handle = pcap->handle; + return PCAP_CALL( bufsize, &params ); +} + int CDECL pcap_can_set_rfmon( struct pcap *pcap ) { struct can_set_rfmon_params params; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 5c26ad0c24e..7a59dda3caf 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -4,7 +4,7 @@ @ stub bpf_validate @ stub eproto_db @ cdecl pcap_activate(ptr) -@ stub pcap_bufsize +@ cdecl pcap_bufsize(ptr) @ cdecl pcap_breakloop(ptr) @ cdecl pcap_can_set_rfmon(ptr) @ cdecl pcap_close(ptr)

1 0

André Zwing : maintainers: Remove myself as maintainer of wpcap.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 5ff8c089a92d949cd1b40826f32abb49155046ef URL: https://gitlab.winehq.org/wine/wine/-/commit/5ff8c089a92d949cd1b40826f32abb… Author: André Zwing <nerv(a)dawncrow.de> Date: Mon Feb 13 12:36:57 2023 +0100 maintainers: Remove myself as maintainer of wpcap. --- MAINTAINERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 50f75e04e6f..22351f5af60 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -395,10 +395,6 @@ WinINet P: Jacek Caban <jacek(a)codeweavers.com> F: dlls/wininet/ -WPcap -M: André Zwing <nerv(a)dawncrow.de> -F: dlls/wpcap/ - X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Rémi Bernon <rbernon(a)codeweavers.com>

1 0

Hans Leidekker : configure: Check for pcap_init() instead of pcap_create().
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 032e8d9c362b881a4213c819d1cc6262f2df4b35 URL: https://gitlab.winehq.org/wine/wine/-/commit/032e8d9c362b881a4213c819d1cc62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 7 21:40:23 2023 +0100 configure: Check for pcap_init() instead of pcap_create(). pcap_init() will be required by later patches and it was introduced after pcap_create(). --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index f07125ef8f6..aae3f417b67 100755 --- a/configure +++ b/configure @@ -15708,9 +15708,9 @@ fi if test "$ac_cv_header_pcap_pcap_h" = "yes" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5 -printf %s "checking for pcap_create in -lpcap... " >&6; } -if test ${ac_cv_lib_pcap_pcap_create+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pcap_init in -lpcap" >&5 +printf %s "checking for pcap_init in -lpcap... " >&6; } +if test ${ac_cv_lib_pcap_pcap_init+y} then : printf %s "(cached) " >&6 else $as_nop @@ -15722,35 +15722,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char pcap_create (); +char pcap_init (); int main (void) { -return pcap_create (); +return pcap_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_pcap_pcap_create=yes + ac_cv_lib_pcap_pcap_init=yes else $as_nop - ac_cv_lib_pcap_pcap_create=no + ac_cv_lib_pcap_pcap_init=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5 -printf "%s\n" "$ac_cv_lib_pcap_pcap_create" >&6; } -if test "x$ac_cv_lib_pcap_pcap_create" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_init" >&5 +printf "%s\n" "$ac_cv_lib_pcap_pcap_init" >&6; } +if test "x$ac_cv_lib_pcap_pcap_init" = xyes then : PCAP_LIBS="-lpcap" fi fi -if test "x$ac_cv_lib_pcap_pcap_create" != xyes +if test "x$ac_cv_lib_pcap_pcap_init" != xyes then : case "x$with_pcap" in x) as_fn_append wine_notices "|pcap ${notice_platform}development files not found, wpcap won't be supported." ;; diff --git a/configure.ac b/configure.ac index 6410f8a0e42..3d996c34fae 100644 --- a/configure.ac +++ b/configure.ac @@ -1371,9 +1371,9 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes], dnl **** Check for libpcap **** if test "$ac_cv_header_pcap_pcap_h" = "yes" then - AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) + AC_CHECK_LIB(pcap,pcap_init,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) fi -WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], +WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_init" != xyes], [pcap ${notice_platform}development files not found, wpcap won't be supported.], [enable_wpcap])

1 0

Zebediah Figura : vkd3d-shader/hlsl: Inline function calls.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: vkd3d Branch: master Commit: 4b944517b721d4f3cee1100014cf4171e1fc84a9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b944517b721d4f3cee1100014cf4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 16:56:04 2021 -0500 vkd3d-shader/hlsl: Inline function calls. --- libs/vkd3d-shader/hlsl.c | 289 ++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 + libs/vkd3d-shader/hlsl_codegen.c | 32 ++- libs/vkd3d-shader/hlsl_sm1.c | 3 +- libs/vkd3d-shader/hlsl_sm4.c | 3 +- tests/function-return.shader_test | 22 +- tests/hlsl-function.shader_test | 16 +- tests/hlsl-numthreads.shader_test | 2 +- tests/hlsl-return-implicit-conversion.shader_test | 60 ++--- tests/hlsl-static-initializer.shader_test | 6 +- tests/hlsl-storage-qualifiers.shader_test | 6 +- tests/uav-out-param.shader_test | 8 +- 12 files changed, 383 insertions(+), 66 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Handle early return after a CF block only if there was actually a return somewhere in the CF block.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: vkd3d Branch: master Commit: 38964214cd65cd429e7882b3f848e8f8966d56a9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/38964214cd65cd429e7882b3f848e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 13 23:48:38 2021 -0500 vkd3d-shader/hlsl: Handle early return after a CF block only if there was actually a return somewhere in the CF block. --- libs/vkd3d-shader/hlsl_codegen.c | 65 ++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2e5feff1..80d52dfc 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -520,11 +520,12 @@ static void insert_early_return_break(struct hlsl_ctx *ctx, } /* Remove HLSL_IR_JUMP_RETURN calls by altering subsequent control flow. */ -static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *func, +static bool lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *func, struct hlsl_block *block, bool in_loop) { struct hlsl_ir_node *return_instr = NULL, *cf_instr = NULL; struct hlsl_ir_node *instr, *next; + bool has_early_return = false; /* SM1 has no function calls. SM4 does, but native d3dcompiler inlines * everything anyway. We are safest following suit. @@ -546,7 +547,7 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun * return into a break, which offers the right semantics—except that it * won't break out of nested loops. * - * - A CF block which might contain a return statement. After calling + * - A CF block which contains a return statement. After calling * lower_return() on the CF block body, we stop, pull out everything after * the CF instruction, shove it into an if block, and then lower that if * block. @@ -559,6 +560,9 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun * already turned any returns into breaks. If the block we just processed * was conditional, then "break" did our work for us. If it was a loop, * we need to propagate that break to the outer loop. + * + * We return true if there was an early return anywhere in the block we just + * processed (including CF contained inside that block). */ LIST_FOR_EACH_ENTRY_SAFE(instr, next, &block->instrs, struct hlsl_ir_node, entry) @@ -573,32 +577,38 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun { struct hlsl_ir_if *iff = hlsl_ir_if(instr); - lower_return(ctx, func, &iff->then_instrs, in_loop); - lower_return(ctx, func, &iff->else_instrs, in_loop); + has_early_return |= lower_return(ctx, func, &iff->then_instrs, in_loop); + has_early_return |= lower_return(ctx, func, &iff->else_instrs, in_loop); - /* If we're in a loop, we don't need to do anything here. We - * turned the return into a break, and that will already skip - * anything that comes after this "if" block. */ - if (!in_loop) + if (has_early_return) { - cf_instr = instr; - break; + /* If we're in a loop, we don't need to do anything here. We + * turned the return into a break, and that will already skip + * anything that comes after this "if" block. */ + if (!in_loop) + { + cf_instr = instr; + break; + } } } else if (instr->type == HLSL_IR_LOOP) { - lower_return(ctx, func, &hlsl_ir_loop(instr)->body, true); + has_early_return |= lower_return(ctx, func, &hlsl_ir_loop(instr)->body, true); - if (in_loop) - { - /* "instr" is a nested loop. "return" breaks out of all - * loops, so break out of this one too now. */ - insert_early_return_break(ctx, func, instr); - } - else + if (has_early_return) { - cf_instr = instr; - break; + if (in_loop) + { + /* "instr" is a nested loop. "return" breaks out of all + * loops, so break out of this one too now. */ + insert_early_return_break(ctx, func, instr); + } + else + { + cf_instr = instr; + break; + } } } else if (instr->type == HLSL_IR_JUMP) @@ -610,13 +620,14 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun if (jump->type == HLSL_IR_JUMP_RETURN) { if (!(constant = hlsl_new_bool_constant(ctx, true, &jump->node.loc))) - return; + return false; list_add_before(&jump->node.entry, &constant->node.entry); if (!(store = hlsl_new_simple_store(ctx, func->early_return_var, &constant->node))) - return; + return false; list_add_after(&constant->node.entry, &store->node.entry); + has_early_return = true; if (in_loop) { jump->type = HLSL_IR_JUMP_BREAK; @@ -658,24 +669,26 @@ static void lower_return(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *fun assert(!in_loop); if (tail == &cf_instr->entry) - return; + return has_early_return; if (!(load = hlsl_new_var_load(ctx, func->early_return_var, cf_instr->loc))) - return; + return false; list_add_tail(&block->instrs, &load->node.entry); if (!(not = hlsl_new_unary_expr(ctx, HLSL_OP1_LOGIC_NOT, &load->node, cf_instr->loc))) - return; + return false; list_add_tail(&block->instrs, &not->entry); if (!(iff = hlsl_new_if(ctx, not, cf_instr->loc))) - return; + return false; list_add_tail(&block->instrs, &iff->node.entry); list_move_slice_tail(&iff->then_instrs.instrs, list_next(&block->instrs, &cf_instr->entry), tail); lower_return(ctx, func, &iff->then_instrs, in_loop); } + + return has_early_return; } /* Remove HLSL_IR_CALL instructions by inlining them. */

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow the final expression in a for loop initializer to be omitted.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: vkd3d Branch: master Commit: 58445da64bb894cd092be4aa142a620842dd26b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58445da64bb894cd092be4aa142a6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 13 22:40:09 2021 -0500 vkd3d-shader/hlsl: Allow the final expression in a for loop initializer to be omitted. --- libs/vkd3d-shader/hlsl.y | 14 +++++++++----- tests/return.shader_test | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d5e2b2a9..3bad2acc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3647,6 +3647,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <list> declaration_statement %type <list> equality_expr %type <list> expr +%type <list> expr_optional %type <list> expr_statement %type <list> initializer_expr %type <list> jump_statement @@ -4875,24 +4876,27 @@ loop_statement: { $$ = create_loop(ctx, LOOP_DO_WHILE, NULL, $5, NULL, $2, @1); } - | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement + | KW_FOR '(' scope_start expr_statement expr_statement expr_optional ')' statement { $$ = create_loop(ctx, LOOP_FOR, $4, $5, $6, $8, @1); hlsl_pop_scope(ctx); } - | KW_FOR '(' scope_start declaration expr_statement expr ')' statement + | KW_FOR '(' scope_start declaration expr_statement expr_optional ')' statement { $$ = create_loop(ctx, LOOP_FOR, $4, $5, $6, $8, @1); hlsl_pop_scope(ctx); } -expr_statement: - ';' +expr_optional: + %empty { if (!($$ = make_empty_list(ctx))) YYABORT; } - | expr ';' + | expr + +expr_statement: + expr_optional ';' { $$ = $1; } diff --git a/tests/return.shader_test b/tests/return.shader_test index a66d8756..2660c6dd 100644 --- a/tests/return.shader_test +++ b/tests/return.shader_test @@ -215,7 +215,7 @@ todo draw quad todo probe all rgba (0.2, 0.2, 0.2, 0.2) uniform 0 float 0.8 todo draw quad -todo probe all rgba (0.5, 0.5, 0.5, 0.5) +probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader todo]

1 0

Zebediah Figura : vkd3d-shader/hlsl: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: vkd3d Branch: master Commit: 6177cea31fcdceaf2111f891dd2336442e4b9a40 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6177cea31fcdceaf2111f891dd233… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 9 15:26:04 2023 -0600 vkd3d-shader/hlsl: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode. This was originally left alone in order to allow functions without early return to succeed, since in that case we would already emit the correct bytecode despite not handling the HLSL_IR_JUMP_RETURN instruction. Now that we lower return statements, however, any unhandled instructions are either definitely going to result in invalid bytecode, or rare enough that it's not worth returning success anyway. --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 2 +- tests/return.shader_test | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 41b111a5..93e9fd8e 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -919,7 +919,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b break; default: - FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + hlsl_fixme(ctx, &instr->loc, "Instruction type %s.", hlsl_node_type_to_string(instr->type)); } } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fb14889d..69f9b9d3 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2401,7 +2401,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * break; default: - FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + hlsl_fixme(ctx, &instr->loc, "Instruction type %s.", hlsl_node_type_to_string(instr->type)); } } } diff --git a/tests/return.shader_test b/tests/return.shader_test index 3847765e..a66d8756 100644 --- a/tests/return.shader_test +++ b/tests/return.shader_test @@ -146,7 +146,7 @@ void main(out float4 ret : sv_target) todo draw quad todo probe all rgba (0.2, 0.4, 0.6, 0.8) -[pixel shader] +[pixel shader todo] uniform float f; @@ -166,23 +166,23 @@ void main(out float4 ret : sv_target) [test] uniform 0 float 0.0 -draw quad +todo draw quad todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1 uniform 0 float 0.1 -draw quad +todo draw quad todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 0 float 0.3 -draw quad +todo draw quad todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float 0.7 -draw quad +todo draw quad todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1 uniform 0 float 0.9 -draw quad +todo draw quad todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 [pixel shader todo]

1 0

Zebediah Figura : vkd3d-shader/hlsl: Emit a hlsl_fixme() if multiple valid entry point definitions are given.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: vkd3d Branch: master Commit: 0cf39f3c63472e34968f71e4f4aacd7448f55231 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0cf39f3c63472e34968f71e4f4aac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 9 14:36:58 2023 -0600 vkd3d-shader/hlsl: Emit a hlsl_fixme() if multiple valid entry point definitions are given. --- libs/vkd3d-shader/hlsl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1f21f043..3656d05d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2696,8 +2696,13 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d { if (!decl->has_body) continue; + if (entry_func) + { + /* Depending on d3dcompiler version, either the first or last is + * selected. */ + hlsl_fixme(&ctx, &decl->loc, "Multiple valid entry point definitions."); + } entry_func = decl; - break; } }

1 0