wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Hans Leidekker : wpcap: Fix an off-by-one error in convert_length_to_ipv6_mask().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 90f53d681a2fbd0c9fcb9db33b50183688b61031 URL: https://gitlab.winehq.org/wine/wine/-/commit/90f53d681a2fbd0c9fcb9db33b5018… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 16:33:40 2023 +0100 wpcap: Fix an off-by-one error in convert_length_to_ipv6_mask(). --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 5494ed292e1..5c25e4a2708 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -444,7 +444,7 @@ static struct sockaddr *get_address( const IP_ADAPTER_UNICAST_ADDRESS *addr ) static void convert_length_to_ipv6_mask( ULONG length, IN6_ADDR *mask ) { unsigned int i; - for (i = 0; i < length / 8; i++) mask->u.Byte[i] = 0xff; + for (i = 0; i < length / 8 - 1; i++) mask->u.Byte[i] = 0xff; mask->u.Byte[i] = 0xff << (8 - length % 8); }

1 0

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

13 Feb '23

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: Sync spec file with latest version of libpcap.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: adf7336b53042f4875a62e28d51931c836af2889 URL: https://gitlab.winehq.org/wine/wine/-/commit/adf7336b53042f4875a62e28d51931… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 12:39:19 2023 +0100 wpcap: Sync spec file with latest version of libpcap. --- dlls/wpcap/wpcap.c | 2 +- dlls/wpcap/wpcap.spec | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 4d8a115b0ea..0964715f92c 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -865,7 +865,7 @@ const char * CDECL pcap_tstamp_type_val_to_name( int val ) return ret; } -int CDECL wsockinit( void ) +int CDECL pcap_wsockinit( void ) { WSADATA wsadata; TRACE( "\n" ); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 8cbb44148e8..5c26ad0c24e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -2,11 +2,9 @@ @ stub bpf_filter @ stub bpf_image @ stub bpf_validate -@ stub endservent @ stub eproto_db -@ stub getservent -@ stub install_bpf_program @ cdecl pcap_activate(ptr) +@ stub pcap_bufsize @ cdecl pcap_breakloop(ptr) @ cdecl pcap_can_set_rfmon(ptr) @ cdecl pcap_close(ptr) @@ -14,9 +12,11 @@ @ stub pcap_compile_nopcap @ cdecl pcap_create(str ptr) @ stub pcap_createsrcstr +@ stub pcap_datalink_ext @ cdecl pcap_datalink(ptr) @ cdecl pcap_datalink_name_to_val(str) @ cdecl pcap_datalink_val_to_description(long) +@ stub pcap_datalink_val_to_description_or_dlt @ cdecl pcap_datalink_val_to_name(long) @ cdecl pcap_dispatch(ptr long ptr ptr) @ cdecl pcap_dump(ptr ptr str) @@ -24,7 +24,12 @@ @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell +@ stub pcap_dump_ftell64 +@ stub pcap_dump_hopen @ cdecl pcap_dump_open(ptr str) +@ stub pcap_dump_open_append +@ stub pcap_ether_aton +@ stub pcap_ether_hostton @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) @@ -38,6 +43,10 @@ @ cdecl pcap_geterr(ptr) @ stub pcap_getevent @ cdecl pcap_getnonblock(ptr ptr) +@ stub pcap_hopen_offline +@ stub pcap_hopen_offline_with_tstamp_precision +@ stub pcap_init +@ stub pcap_inject @ stub pcap_is_swapped @ cdecl pcap_lib_version() @ cdecl pcap_list_datalinks(ptr ptr) @@ -53,15 +62,18 @@ @ stub pcap_next_etherent @ cdecl pcap_next_ex(ptr ptr ptr) @ stub pcap_offline_filter -@ stub pcap_offline_read +@ stub pcap_oid_get_request +@ stub pcap_oid_set_request @ cdecl pcap_open(str long long long ptr ptr) @ stub pcap_open_dead +@ stub pcap_open_dead_with_tstamp_precision @ cdecl pcap_open_live(str long long long ptr) @ stub pcap_open_offline +@ stub pcap_open_offline_with_tstamp_precision @ cdecl pcap_parsesrcstr(str ptr ptr ptr ptr ptr) @ stub pcap_perror -@ stub pcap_read @ stub pcap_remoteact_accept +@ stub pcap_remoteact_accept_ex @ stub pcap_remoteact_cleanup @ stub pcap_remoteact_close @ stub pcap_remoteact_list @@ -72,6 +84,7 @@ @ stub pcap_sendqueue_transmit @ cdecl pcap_set_buffer_size(ptr long) @ cdecl pcap_set_datalink(ptr long) +@ stub pcap_set_immediate_mode @ cdecl pcap_set_promisc(ptr long) @ cdecl pcap_set_rfmon(ptr long) @ cdecl pcap_set_snaplen(ptr long) @@ -79,6 +92,7 @@ @ cdecl pcap_set_tstamp_precision(ptr long) @ cdecl pcap_set_tstamp_type(ptr long) @ cdecl pcap_setbuff(ptr long) +@ stub pcap_setdirection @ cdecl pcap_setfilter(ptr ptr) @ stub pcap_setmintocopy @ stub pcap_setmode @@ -93,4 +107,5 @@ @ cdecl pcap_tstamp_type_name_to_val(str) @ cdecl pcap_tstamp_type_val_to_description(long) @ cdecl pcap_tstamp_type_val_to_name(long) -@ cdecl wsockinit() +@ stub pcap_version +@ cdecl pcap_wsockinit()

1 0

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

13 Feb '23

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

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

13 Feb '23

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

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

13 Feb '23

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: Handle early return after a CF block only if there was actually a return somewhere in the CF block.
by Alexandre Julliard 13 Feb '23

13 Feb '23

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: Inline function calls.
by Alexandre Julliard 13 Feb '23

13 Feb '23

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: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode.
by Alexandre Julliard 13 Feb '23

13 Feb '23

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: Lower return statements.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: vkd3d Branch: master Commit: 8bdee6681bcfd6ca2830c543b990c784303607b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8bdee6681bcfd6ca2830c543b990c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 13 23:08:34 2021 -0500 vkd3d-shader/hlsl: Lower return statements. --- include/private/list.h | 24 +++++ libs/vkd3d-shader/hlsl.c | 14 +++ libs/vkd3d-shader/hlsl.h | 5 ++ libs/vkd3d-shader/hlsl_codegen.c | 186 +++++++++++++++++++++++++++++++++++++++ tests/return.shader_test | 14 +-- 5 files changed, 236 insertions(+), 7 deletions(-)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2023