wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Alexandre Julliard : widl: Fix method number for call_as functions.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: dd68561c4a7ddef876f051b4af146c6c66568d93 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd68561c4a7ddef876f051b4af146c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 15:44:25 2024 +0100 widl: Fix method number for call_as functions. --- tools/widl/header.h | 1 + tools/widl/proxy.c | 2 +- tools/widl/typegen.c | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 045eb59b000..ae06d92bfa8 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -34,6 +34,7 @@ extern int needs_space_after(type_t *t); extern int is_object(const type_t *iface); extern int is_local(const attr_list_t *list); extern int count_methods(const type_t *iface); +extern const statement_t * get_callas_source(const type_t *iface, const var_t *def); extern int need_stub(const type_t *iface); extern int need_proxy(const type_t *iface); extern int need_inline_stubs(const type_t *iface); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8fed948d8de..30a4939ef5d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -464,7 +464,7 @@ int count_methods(const type_t *iface) return count; } -static const statement_t * get_callas_source(const type_t * iface, const var_t * def) +const statement_t *get_callas_source(const type_t *iface, const var_t *def) { const statement_t * source; STATEMENTS_FOR_EACH_FUNC( source, type_iface_get_stmts(iface)) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2af08d87081..3658f779857 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1598,7 +1598,11 @@ static void write_iface_procformatstring(type_t *iface, FILE *file, int indent, STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { var_t *func = stmt->u.var; - if (is_local(func->attrs)) continue; + if (is_local(func->attrs)) + { + if (!get_callas_source(iface, func)) count++; + continue; + } write_procformatstring_func( file, indent, iface, func, offset, count++ ); } }

1 0

Alexandre Julliard : widl: Merge interpreted stubs header and parameters output into a single function.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 7ff6c6316ecf1b498059eecfc78ba834937af34f URL: https://gitlab.winehq.org/wine/wine/-/commit/7ff6c6316ecf1b498059eecfc78ba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 08:51:01 2024 +0100 widl: Merge interpreted stubs header and parameters output into a single function. --- tools/widl/typegen.c | 76 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 14d8906173b..824ba5d4a89 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1357,7 +1357,7 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) return (get_stub_mode() != MODE_Os); } -static void write_proc_func_header( FILE *file, int indent, const type_t *iface, +static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, const var_t *func, unsigned int *offset, unsigned short num_proc ) { @@ -1365,6 +1365,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, var_list_t *args = type_function_get_args( func->declspec.type ); unsigned char explicit_fc, implicit_fc; unsigned char handle_flags; + var_t *retval = type_function_get_retval( func->declspec.type ); const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); unsigned char oi_flags = Oi_HAS_RPCFLAGS | Oi_USE_NEW_INIT_ROUTINES; unsigned int rpc_flags = get_rpc_flags( func->attrs ); @@ -1393,7 +1394,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, param_num++; nb_args++; } - if (!is_void( type_function_get_rettype( func->declspec.type ))) + if (!is_void( retval->declspec.type )) { stack_size += pointer_size; nb_args++; @@ -1445,6 +1446,7 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, if (get_stub_mode() == MODE_Oif) { + unsigned int stack_offset = is_object(iface) ? pointer_size : 0; unsigned char oi2_flags = get_func_oi2_flags( func ); unsigned char ext_flags = 0; unsigned int size; @@ -1487,6 +1489,43 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, print_file( file, indent, "NdrFcShort(0x%x),\n", fpu_mask ); /* floating point mask */ *offset += 2; } + + /* emit argument data */ + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); + } + + /* emit return value data */ + if (!is_void( retval->declspec.type )) + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_new_procformatstring_type(file, indent, retval, TRUE, &stack_offset); + } + } + else /* old style */ + { + /* emit argument data */ + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_old_procformatstring_type(file, indent, var, FALSE, TRUE); + } + + /* emit return value data */ + if (is_void(retval->declspec.type)) + { + print_file(file, 0, "/* %u (void) */\n", *offset); + print_file(file, indent, "0x5b,\t/* FC_END */\n"); + print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); + *offset += 2; + } + else + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_old_procformatstring_type(file, indent, retval, TRUE, TRUE); + } } } @@ -1494,12 +1533,13 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i const var_t *func, unsigned int *offset, unsigned short num_proc ) { - unsigned int stack_offset = is_object( iface ) ? pointer_size : 0; - int is_interpreted = is_interpreted_func( iface, func ); - int is_new_style = is_interpreted && (get_stub_mode() == MODE_Oif); - var_t *retval = type_function_get_retval( func->declspec.type ); + var_t *retval; - if (is_interpreted) write_proc_func_header( file, indent, iface, func, offset, num_proc ); + if (is_interpreted_func( iface, func )) + { + write_proc_func_interp( file, indent, iface, func, offset, num_proc ); + return; + } /* emit argument data */ if (type_function_get_args(func->declspec.type)) @@ -1508,31 +1548,23 @@ static void write_procformatstring_func( FILE *file, int indent, const type_t *i LIST_FOR_EACH_ENTRY( var, type_function_get_args(func->declspec.type), const var_t, entry ) { print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); - if (is_new_style) - *offset += write_new_procformatstring_type(file, indent, var, FALSE, &stack_offset); - else - *offset += write_old_procformatstring_type(file, indent, var, FALSE, is_interpreted); + *offset += write_old_procformatstring_type(file, indent, var, FALSE, FALSE); } } /* emit return value data */ + retval = type_function_get_retval( func->declspec.type ); if (is_void(retval->declspec.type)) { - if (!is_new_style) - { - print_file(file, 0, "/* %u (void) */\n", *offset); - print_file(file, indent, "0x5b,\t/* FC_END */\n"); - print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); - *offset += 2; - } + print_file(file, 0, "/* %u (void) */\n", *offset); + print_file(file, indent, "0x5b,\t/* FC_END */\n"); + print_file(file, indent, "0x5c,\t/* FC_PAD */\n"); + *offset += 2; } else { print_file( file, 0, "/* %u (return value) */\n", *offset ); - if (is_new_style) - *offset += write_new_procformatstring_type(file, indent, retval, TRUE, &stack_offset); - else - *offset += write_old_procformatstring_type(file, indent, retval, TRUE, is_interpreted); + *offset += write_old_procformatstring_type(file, indent, retval, TRUE, FALSE); } }

1 0

Francisco Casas : tests/test-driver: Print line where vkd3d_unreachable() was hit.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: b1eaf8327bf59b516f80e232e86332473ed97edc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b1eaf8327bf59b516f80e232e8633… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 21 20:19:02 2024 -0300 tests/test-driver: Print line where vkd3d_unreachable() was hit. With this, a test that fails because vkd3d_unreacheable() was hit, will now display the error line. FAIL: tests/hlsl/some-test.shader_test (SM4.0-SM5.1)OpenGL/SPIR-V 43[XF] 79[XF] 126[XF] 149[XF] 159[XF] [AF] vkd3d/libs/vkd3d-shader/hlsl.c:246: Aborting, reached unreachable code. [SIGABRT] Aborted (core dumped) --- tests/test-driver.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test-driver.sh b/tests/test-driver.sh index 514e38d3..869cc4be 100755 --- a/tests/test-driver.sh +++ b/tests/test-driver.sh @@ -174,7 +174,11 @@ BEGIN { } /: Assertion .* failed\./ { - print "[AF]" $0 + print "# [AF] <fade>" $0 "<reset>" +} + +/: Aborting, reached unreachable code\./ { + print "# [AF] <fade>" $0 "<reset>" } EOF

1 0

Francisco Casas : tests/test-driver: Display [SIGABRT] and [SIGSEGV] tags.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 9a90b9591ced073905f5f228c3b498d369dd08a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a90b9591ced073905f5f228c3b49… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 21 16:18:34 2024 -0300 tests/test-driver: Display [SIGABRT] and [SIGSEGV] tags. Some times the test can be aborted for reasons others than failed assertions, such as segmentation faults or reaching unreacheable code. This commit adds purple tags to the test driver for visual clarity. --- tests/test-driver.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/test-driver.sh b/tests/test-driver.sh index 221a963e..514e38d3 100755 --- a/tests/test-driver.sh +++ b/tests/test-driver.sh @@ -182,6 +182,15 @@ EOF details=$(awk "$awk_program" "$log_file") +# In case of SIGABRT or SIGSEGV, add tag and print second to last line, containing the +# "(core dumped)" message. +nxt_to_last_line=$(tail -n2 "$log_file" | head -n -1) +if [ "$tweaked_estatus" -eq 134 ]; then + details="$details# [SIGABRT] <fade>$nxt_to_last_line<reset>" +elif [ "$tweaked_estatus" -eq 139 ]; then + details="$details# [SIGSEGV] <fade>$nxt_to_last_line<reset>" +fi + # Count number of [XF] tags. xfcount=$(echo "$details" | awk '/\[XF\]/{count++} END{printf "%d", count}') @@ -190,6 +199,8 @@ details=$(echo "$details" |\ sed "s/\[XF\]/$color_yellow[XF]$color_reset/g" |\ sed "s/\[XP\]/$color_dark_red[XP]$color_reset/g" |\ sed "s/\[AF\]/$color_bright_purple[AF]$color_reset/g" |\ + sed "s/\[SIGABRT\]/$color_bright_purple[SIGABRT]$color_reset/g" |\ + sed "s/\[SIGSEGV\]/$color_bright_purple[SIGSEGV]$color_reset/g" |\ sed "s/<fade>/$color_fade/g" |\ sed "s/<reset>/$color_reset/g" |\ tr '\n' ' ' |\

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic Discard.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 11ee92ed7eb1287e0be7acf8d082b5d77a6c09eb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/11ee92ed7eb1287e0be7acf8d082b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Mar 20 14:54:18 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic Discard. --- libs/vkd3d-shader/dxil.c | 14 ++++++++++++++ tests/hlsl/clip.shader_test | 8 ++++---- tests/hlsl/discard.shader_test | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1a795172..0787ee13 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -401,6 +401,7 @@ enum dx_intrinsic_opcode DX_ATOMIC_BINOP = 78, DX_ATOMIC_CMP_XCHG = 79, DX_BARRIER = 80, + DX_DISCARD = 82, DX_DERIV_COARSEX = 83, DX_DERIV_COARSEY = 84, DX_DERIV_FINEX = 85, @@ -4460,6 +4461,18 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int ins->handler_idx = VKD3DSIH_NOP; } +static void sm6_parser_emit_dx_discard(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_DISCARD); + + if ((src_param = instruction_src_params_alloc(ins, 1, sm6))) + src_param_init_from_value(src_param, operands[0]); +} + static void sm6_parser_emit_dx_fabs(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5315,6 +5328,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_DERIV_COARSEY ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_FINEX ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_FINEY ] = {"e", "R", sm6_parser_emit_dx_unary}, + [DX_DISCARD ] = {"v", "1", sm6_parser_emit_dx_discard}, [DX_EXP ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_FABS ] = {"g", "R", sm6_parser_emit_dx_fabs}, [DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/clip.shader_test b/tests/hlsl/clip.shader_test index 3c003f1f..1ebc0687 100644 --- a/tests/hlsl/clip.shader_test +++ b/tests/hlsl/clip.shader_test @@ -9,14 +9,14 @@ float4 main() : sv_target [test] uniform 0 float4 1 2 3 4 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (9, 8, 7, 6) uniform 0 float4 -1 8 7 6 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (9, 8, 7, 6) uniform 0 float4 9 0 7 6 -todo(sm>=6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (9, 0, 7, 6) diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index dba1b9b8..a5c210f0 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -9,8 +9,8 @@ float4 main() : sv_target [test] uniform 0 float4 1 2 3 4 -todo(sm<4 | sm>=6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 -todo(sm<4 | sm>=6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (1, 2, 3, 4)

1 0

Conor McCarthy : vkd3d-shader/spirv: Support bool source in spirv_compiler_emit_discard().
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 8d947ce8683a9b4afc0012347d31d2156676c54e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d947ce8683a9b4afc0012347d31d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Mar 20 14:53:15 2024 +1000 vkd3d-shader/spirv: Support bool source in spirv_compiler_emit_discard(). --- libs/vkd3d-shader/spirv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ede7c623..46130244 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8007,8 +8007,9 @@ static void spirv_compiler_emit_discard(struct spirv_compiler *compiler, * a mismatch between the VSIR structure and the SPIR-V one, which would cause problems if * structurisation is necessary. Therefore we emit it as a function call. */ condition_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); - condition_id = spirv_compiler_emit_int_to_bool(compiler, - instruction->flags, src->reg.data_type, 1, condition_id); + if (src->reg.data_type != VKD3D_DATA_BOOL) + condition_id = spirv_compiler_emit_int_to_bool(compiler, + instruction->flags, src->reg.data_type, 1, condition_id); void_id = vkd3d_spirv_get_op_type_void(builder); vkd3d_spirv_build_op_function_call(builder, void_id, spirv_compiler_get_discard_function_id(compiler), &condition_id, 1);

1 0

Zebediah Figura : vkd3d-shader: Add a compile option to control whether implicit truncation warnings are printed.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 6b6e4bc212326986801a45c5fd6cb41bf0f1bb82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b6e4bc212326986801a45c5fd6cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 19 23:06:07 2024 -0500 vkd3d-shader: Add a compile option to control whether implicit truncation warnings are printed. d3dcompiler and d3dx9 versions before 42 don't emit this error; this will be necessary to emulate that behaviour. Other warnings exist that are introduced in different d3dcompiler versions, although there are not very many distinct HLSL warnings to begin with. We could of course group all these together under a single compiler option, but I find that using separate top-level options is unilaterally friendlier to an API consumer, and simpler to implement as well. It also in some sense maps conceptually to e.g. "-Wno-implicit-conversion". --- include/vkd3d_shader.h | 11 ++++++++++ libs/vkd3d-shader/hlsl.c | 37 ++++++++++++++++++++++------------ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 2 +- tests/vkd3d_shader_api.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 14 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0cd2a861..0ce2ef67 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -310,6 +310,17 @@ enum vkd3d_shader_compile_option_name * \since 1.12 */ VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT = 0x0000000b, + /** + * If \a value is nonzero, emit a compile warning warn when vectors or + * matrices are truncated in an implicit conversion. + * If warnings are disabled, this option has no effect. + * This option has no effects for targets other than HLSL. + * + * The default value is nonzero, i.e. enable implicit truncation warnings. + * + * \since 1.12 + */ + VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION = 0x0000000c, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 147b86f5..cba954c9 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3593,24 +3593,35 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct vkd3d_shader_compil return false; ctx->cur_buffer = ctx->globals_buffer; + ctx->warn_implicit_truncation = true; + for (i = 0; i < compile_info->option_count; ++i) { const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; - if (option->name == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER) - { - if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ROW_MAJOR) - ctx->matrix_majority = HLSL_MODIFIER_ROW_MAJOR; - else if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR) - ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; - } - else if (option->name == VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY) - { - ctx->semantic_compat_mapping = option->value & VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; - } - else if (option->name == VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT) + switch (option->name) { - ctx->child_effect = !!option->value; + case VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER: + if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ROW_MAJOR) + ctx->matrix_majority = HLSL_MODIFIER_ROW_MAJOR; + else if (option->value == VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_COLUMN_MAJOR) + ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; + break; + + case VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY: + ctx->semantic_compat_mapping = option->value & VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; + break; + + case VKD3D_SHADER_COMPILE_OPTION_CHILD_EFFECT: + ctx->child_effect = option->value; + break; + + case VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION: + ctx->warn_implicit_truncation = option->value; + break; + + default: + break; } } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 93ec67d0..64111f3f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -925,6 +925,7 @@ struct hlsl_ctx bool semantic_compat_mapping; bool child_effect; + bool warn_implicit_truncation; }; struct hlsl_resource_load_params diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2824e26d..52c21765 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -413,7 +413,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return NULL; } - if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) + if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy && ctx->warn_implicit_truncation) hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", src_type->class == HLSL_CLASS_VECTOR ? "vector" : "matrix"); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 1dc1a313..d3aa2e52 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -1642,6 +1642,57 @@ static void test_emit_signature(void) } } +static void test_warning_options(void) +{ + struct vkd3d_shader_hlsl_source_info hlsl_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO}; + struct vkd3d_shader_compile_info info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO}; + struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_code d3dbc; + char *messages; + int rc; + + static const char ps_source[] = + "float4 main(uniform float4 u) : color\n" + "{\n" + " float3 x = u;\n" + " return 0;\n" + "}\n"; + + hlsl_info.profile = "ps_2_0"; + + info.next = &hlsl_info; + info.source.code = ps_source; + info.source.size = ARRAY_SIZE(ps_source); + info.source_type = VKD3D_SHADER_SOURCE_HLSL; + info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; + info.log_level = VKD3D_SHADER_LOG_INFO; + + rc = vkd3d_shader_compile(&info, &d3dbc, &messages); + ok(rc == VKD3D_OK, "Got rc %d.\n", rc); + ok(messages, "Expected messages.\n"); + vkd3d_shader_free_shader_code(&d3dbc); + vkd3d_shader_free_messages(messages); + + info.options = options; + info.option_count = ARRAY_SIZE(options); + options[0].name = VKD3D_SHADER_COMPILE_OPTION_WARN_IMPLICIT_TRUNCATION; + options[0].value = 0; + + rc = vkd3d_shader_compile(&info, &d3dbc, &messages); + ok(rc == VKD3D_OK, "Got rc %d.\n", rc); + ok(!messages, "Expected no messages.\n"); + vkd3d_shader_free_shader_code(&d3dbc); + vkd3d_shader_free_messages(messages); + + options[0].value = 1; + + rc = vkd3d_shader_compile(&info, &d3dbc, &messages); + ok(rc == VKD3D_OK, "Got rc %d.\n", rc); + ok(messages, "Expected messages.\n"); + vkd3d_shader_free_shader_code(&d3dbc); + vkd3d_shader_free_messages(messages); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); @@ -1656,4 +1707,5 @@ START_TEST(vkd3d_shader_api) run_test(test_build_varying_map); run_test(test_scan_combined_resource_samplers); run_test(test_emit_signature); + run_test(test_warning_options); }

1 0

Nikolay Sivov : vkd3d-shader/fx: Accept texture types when writing fx_2_0 effects.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: b382d1843dd5bfb29f7c91adb65a48cd5dbd3858 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b382d1843dd5bfb29f7c91adb65a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 10:46:31 2024 +0100 vkd3d-shader/fx: Accept texture types when writing fx_2_0 effects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 44 ++++++++++++++++++++++++++++ tests/hlsl/effect-variables-fx_2.shader_test | 13 ++++++++ 2 files changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 75fa3a3f..9424a568 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -649,6 +649,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n case HLSL_TYPE_INT: case HLSL_TYPE_UINT: case HLSL_TYPE_VOID: + case HLSL_TYPE_TEXTURE: break; default: hlsl_fixme(ctx, &ctx->location, "Writing parameter type %u is not implemented.", @@ -772,6 +773,46 @@ static uint32_t write_fx_2_initial_value(const struct hlsl_ir_var *var, struct f return offset; } +static bool is_type_supported_fx_2(const struct hlsl_type *type) +{ + type = hlsl_get_multiarray_element_type(type); + + if (type->class == HLSL_CLASS_STRUCT) + return true; + + switch (type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + case HLSL_TYPE_DOUBLE: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + case HLSL_TYPE_PIXELSHADER: + case HLSL_TYPE_VERTEXSHADER: + case HLSL_TYPE_STRING: + return true; + case HLSL_TYPE_TEXTURE: + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_1D: + case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_3D: + case HLSL_SAMPLER_DIM_CUBE: + case HLSL_SAMPLER_DIM_GENERIC: + return true; + default: + ; + } + break; + default: + return false; + } + + return false; +} + static void write_fx_2_parameters(struct fx_write_context *fx) { struct vkd3d_bytecode_buffer *buffer = &fx->structured; @@ -785,6 +826,9 @@ static void write_fx_2_parameters(struct fx_write_context *fx) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { + if (!is_type_supported_fx_2(var->data_type)) + continue; + desc_offset = write_fx_2_parameter(var->data_type, var->name, &var->semantic, fx); value_offset = write_fx_2_initial_value(var, fx); diff --git a/tests/hlsl/effect-variables-fx_2.shader_test b/tests/hlsl/effect-variables-fx_2.shader_test index 570d855a..8e9fd4d5 100644 --- a/tests/hlsl/effect-variables-fx_2.shader_test +++ b/tests/hlsl/effect-variables-fx_2.shader_test @@ -11,3 +11,16 @@ uint _uint; technique { } + +[effect] +Texture tex1; +texture tex2; +teXture tex3; +Texture2DMS<float4, 4> tex4; +Texture1D tex5; +Texture2D tex6; +Texture3D tex7; + +technique +{ +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Treat "texture" type name as case-insensitive.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: b09f91967300acaa834aa29ac4f66c116cadd1ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b09f91967300acaa834aa29ac4f66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 10:16:35 2024 +0100 vkd3d-shader/hlsl: Treat "texture" type name as case-insensitive. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/hlsl/type-names.shader_test | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a82334e5..147b86f5 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -785,6 +785,7 @@ static const char * get_case_insensitive_typename(const char *name) "float", "matrix", "pixelshader", + "texture", "vector", "vertexshader", }; @@ -3408,7 +3409,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1}, {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, - {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, + {"texture", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, {"RenderTargetView",HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1}, diff --git a/tests/hlsl/type-names.shader_test b/tests/hlsl/type-names.shader_test index 2f9d7fef..2cf82dbb 100644 --- a/tests/hlsl/type-names.shader_test +++ b/tests/hlsl/type-names.shader_test @@ -112,3 +112,15 @@ float4 main() : sv_target { return float4(0, 0, 0, 0); } + +[pixel shader fail(sm>=6)] +typedef float4 texturE; +Texture tex1; +texture tex2; +teXture tex3; +texturE var; + +float4 main() : sv_target +{ + return var; +}

1 0

Nikolay Sivov : vkd3d-shader/fx: Handle "uint" type for fx_2_0 parameters.
by Alexandre Julliard 27 Mar '24

27 Mar '24

Module: vkd3d Branch: master Commit: 17dc23269e7932f21a68751ea1b3c4141a199802 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/17dc23269e7932f21a68751ea1b3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 09:31:01 2024 +0100 vkd3d-shader/fx: Handle "uint" type for fx_2_0 parameters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 1 + tests/hlsl/effect-variables-fx_2.shader_test | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 0bc5a8c3..75fa3a3f 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -647,6 +647,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n case HLSL_TYPE_FLOAT: case HLSL_TYPE_BOOL: case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: case HLSL_TYPE_VOID: break; default: diff --git a/tests/hlsl/effect-variables-fx_2.shader_test b/tests/hlsl/effect-variables-fx_2.shader_test index ab992253..570d855a 100644 --- a/tests/hlsl/effect-variables-fx_2.shader_test +++ b/tests/hlsl/effect-variables-fx_2.shader_test @@ -5,6 +5,8 @@ shader model < 3.0 bool _bool; float _float; half _half; +int _int; +uint _uint; technique {

1 0

← Newer
1
2
3
4
5
6
7
...
78
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 March 2024