- Wine-Commits - list.winehq.org

Petrichor Park : vkd3d-shader/hlsl: Implement hyperbolic sin and cos.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: c4182cc272fbe379fc08d3a9c8887ab4c623cf4b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c4182cc272fbe379fc08d3a9c8887… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Mon Feb 19 11:25:53 2024 -0600 vkd3d-shader/hlsl: Implement hyperbolic sin and cos. --- libs/vkd3d-shader/hlsl.y | 48 +++++++++++++++++++++++++++++++++++++ tests/hlsl/trigonometry.shader_test | 12 +++++----- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7fc35d4e..d59d937e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3028,6 +3028,46 @@ static bool intrinsic_cos(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_COS, arg, loc); } +static bool write_cosh_or_sinh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc, bool sinh_mode) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_ir_node *arg; + const char *fn_name, *type_name; + char *body; + + static const char template[] = + "%s %s(%s x)\n" + "{\n" + " return (exp(x) %s exp(-x)) / 2;\n" + "}\n"; + static const char fn_name_sinh[] = "sinh"; + static const char fn_name_cosh[] = "cosh"; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + type_name = arg->data_type->name; + fn_name = sinh_mode ? fn_name_sinh : fn_name_cosh; + + if (!(body = hlsl_sprintf_alloc(ctx, template, + type_name, fn_name, type_name, sinh_mode ? "-" : "+"))) + return false; + + func = hlsl_compile_internal_function(ctx, fn_name, body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + +static bool intrinsic_cosh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_cosh_or_sinh(ctx, params, loc, false); +} + static bool intrinsic_cross(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3873,6 +3913,12 @@ static bool intrinsic_sin(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SIN, arg, loc); } +static bool intrinsic_sinh(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_cosh_or_sinh(ctx, params, loc, true); +} + /* smoothstep(a, b, x) = p^2 (3 - 2p), where p = saturate((x - a)/(b - a)) */ static bool intrinsic_smoothstep(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) @@ -4277,6 +4323,7 @@ intrinsic_functions[] = {"clamp", 3, true, intrinsic_clamp}, {"clip", 1, true, intrinsic_clip}, {"cos", 1, true, intrinsic_cos}, + {"cosh", 1, true, intrinsic_cosh}, {"cross", 2, true, intrinsic_cross}, {"ddx", 1, true, intrinsic_ddx}, {"ddx_coarse", 1, true, intrinsic_ddx_coarse}, @@ -4314,6 +4361,7 @@ intrinsic_functions[] = {"saturate", 1, true, intrinsic_saturate}, {"sign", 1, true, intrinsic_sign}, {"sin", 1, true, intrinsic_sin}, + {"sinh", 1, true, intrinsic_sinh}, {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, {"step", 2, true, intrinsic_step}, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 3f7f1168..d2cfc067 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -76,7 +76,7 @@ todo(sm<4 | glsl) draw quad probe all rgba (0, 1000, -1000.0, 0) -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -86,15 +86,15 @@ float4 main() : sv_target [test] uniform 0 float4 -6.28318531 -0.88137359 0.88137359 6.28318531 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (-267.744894, -1.0, 1.0, 267.744894) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 -todo(sm<6) draw quad +todo(glsl) draw quad % mingw does not support "inf" for scanf(), but numbers beyond FLOAT_MAX consistently result in inf. probe all rgba (0.0, 0.0, -1.0e39, 1.0e39) 1 -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -104,10 +104,10 @@ float4 main() : sv_target [test] uniform 0 float4 -1.76274717 -1.3169579 1.3169579 1.76274717 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (3.0, 2.0, 2.0, 3.0) 2 uniform 0 float4 -0.0 0.0 -90.0 90.0 -todo(sm<6) draw quad +todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0e39, 1.0e39) 1

1 0

Liam Middlebrook : krnl386.exe: Start DOSVM timer on GET_SYSTEM_TIME.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 4d58ee6a75f2db18ef5e67fcb9f718df7a269c1c URL: https://gitlab.winehq.org/wine/wine/-/commit/4d58ee6a75f2db18ef5e67fcb9f718… Author: Liam Middlebrook <liammiddlebrook(a)gmail.com> Date: Sat Apr 13 11:10:21 2024 -0700 krnl386.exe: Start DOSVM timer on GET_SYSTEM_TIME. Start the DOSVM tick timer when the GET_SYSTEM_TIME interrupt (int 1a ah 00) is fired. This fixes a bug when running Sid Meier's CIVILIZATION for Windows 3.1 where the game would appear to hang at the launch screen (although sound would play as expected). This was due to the BIOSDATA.Ticks field never being updated. Signed-off-by: Liam Middlebrook <liammiddlebrook(a)gmail.com> --- dlls/krnl386.exe16/interrupts.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index e062b497853..5087d1b7a03 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -549,6 +549,8 @@ static void WINAPI DOSVM_Int1aHandler( CONTEXT *context ) case 0x00: /* GET SYSTEM TIME */ { BIOSDATA *data = DOSVM_BiosData(); + + DOSVM_start_bios_timer(); SET_CX( context, HIWORD(data->Ticks) ); SET_DX( context, LOWORD(data->Ticks) ); SET_AL( context, 0 ); /* FIXME: midnight flag is unsupported */

1 0

Giovanni Mascellani : vkd3d-shader/ir: Count how many jumps target each loop.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 105ccc4769b966f019d9e04b16cf75cf6f1a1e81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/105ccc4769b966f019d9e04b16cf7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 13 13:39:24 2024 +0100 vkd3d-shader/ir: Count how many jumps target each loop. --- libs/vkd3d-shader/ir.c | 67 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 450f753c..52e1a9c2 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3056,6 +3056,9 @@ struct vsir_cfg * block), but we still try to keep `begin' as forward as * possible, to keep the loop scope as small as possible. */ bool synthetic; + /* The number of jump instructions (both conditional and + * unconditional) that target this loop. */ + unsigned int target_count; } *loop_intervals; size_t loop_interval_count, loop_interval_capacity; @@ -3104,6 +3107,7 @@ static enum vkd3d_result vsir_cfg_add_loop_interval(struct vsir_cfg *cfg, unsign interval->begin = begin; interval->end = end; interval->synthetic = synthetic; + interval->target_count = 0; return VKD3D_OK; } @@ -4106,13 +4110,18 @@ fail: return VKD3D_ERROR_OUT_OF_MEMORY; } -static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *list, unsigned int target) +static void vsir_cfg_remove_trailing_continue(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list, unsigned int target) { struct vsir_cfg_structure *last = &list->structures[list->count - 1]; if (last->type == STRUCTURE_TYPE_JUMP && last->u.jump.type == JUMP_CONTINUE && !last->u.jump.condition && last->u.jump.target == target) + { --list->count; + assert(cfg->loop_intervals[target].target_count > 0); + --cfg->loop_intervals[target].target_count; + } } static struct vsir_cfg_structure *vsir_cfg_get_trailing_break(struct vsir_cfg_structure_list *list) @@ -4143,7 +4152,8 @@ static struct vsir_cfg_structure *vsir_cfg_get_trailing_break(struct vsir_cfg_st * instructions are continue and continue, or continue and break. But * in practice I don't think those situations can happen given the * previous passes we do on the program, so we don't care. */ -static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_structure_list *list) +static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list) { struct vsir_cfg_structure *selection, *if_break, *else_break, *new_break; unsigned int if_target, else_target, max_target; @@ -4166,6 +4176,7 @@ static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_ return VKD3D_ERROR_OUT_OF_MEMORY; new_break->u.jump.type = JUMP_BREAK; new_break->u.jump.target = max_target; + ++cfg->loop_intervals[max_target].target_count; /* Pointer `selection' could have been invalidated by the append * operation. */ @@ -4173,14 +4184,24 @@ static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_ assert(selection->type == STRUCTURE_TYPE_SELECTION); if (if_target == max_target) + { --selection->u.selection.if_body.count; + assert(cfg->loop_intervals[if_target].target_count > 0); + --cfg->loop_intervals[if_target].target_count; + } + if (else_target == max_target) + { --selection->u.selection.else_body.count; + assert(cfg->loop_intervals[else_target].target_count > 0); + --cfg->loop_intervals[else_target].target_count; + } return VKD3D_OK; } -static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structure_list *list) +static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list) { enum vkd3d_result ret; size_t i; @@ -4217,10 +4238,10 @@ static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structur *structure = new_selection; list->count = i + 1; - if ((ret = vsir_cfg_synthesize_selections(&structure->u.selection.else_body)) < 0) + if ((ret = vsir_cfg_synthesize_selections(cfg, &structure->u.selection.else_body)) < 0) return ret; - if ((ret = vsir_cfg_move_breaks_out_of_selections(list)) < 0) + if ((ret = vsir_cfg_move_breaks_out_of_selections(cfg, list)) < 0) return ret; break; @@ -4247,22 +4268,54 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct if (loop_body->count == 0) continue; - vsir_cfg_remove_trailing_continue(loop_body, loop->u.loop.idx); + vsir_cfg_remove_trailing_continue(cfg, loop_body, loop->u.loop.idx); if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) return ret; - if ((ret = vsir_cfg_synthesize_selections(loop_body)) < 0) + if ((ret = vsir_cfg_synthesize_selections(cfg, loop_body)) < 0) return ret; } return VKD3D_OK; } +static void vsir_cfg_count_targets(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) +{ + size_t i; + + for (i = 0; i < list->count; ++i) + { + struct vsir_cfg_structure *structure = &list->structures[i]; + + switch (structure->type) + { + case STRUCTURE_TYPE_BLOCK: + break; + + case STRUCTURE_TYPE_LOOP: + vsir_cfg_count_targets(cfg, &structure->u.loop.body); + break; + + case STRUCTURE_TYPE_SELECTION: + vsir_cfg_count_targets(cfg, &structure->u.selection.if_body); + vsir_cfg_count_targets(cfg, &structure->u.selection.else_body); + break; + + case STRUCTURE_TYPE_JUMP: + if (structure->u.jump.type == JUMP_BREAK || structure->u.jump.type == JUMP_CONTINUE) + ++cfg->loop_intervals[structure->u.jump.target].target_count; + break; + } + } +} + static enum vkd3d_result vsir_cfg_optimize(struct vsir_cfg *cfg) { enum vkd3d_result ret; + vsir_cfg_count_targets(cfg, &cfg->structured_program); + ret = vsir_cfg_optimize_recurse(cfg, &cfg->structured_program); if (TRACE_ON())

1 0

Giovanni Mascellani : vkd3d-shader/ir: Remove loops that terminate with a `break'.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: aad040af05139ab0335b90a0112871ac818747c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aad040af05139ab0335b90a011287… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 13 22:43:50 2024 +0100 vkd3d-shader/ir: Remove loops that terminate with a `break'. --- libs/vkd3d-shader/ir.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 52e1a9c2..e0928ff7 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4250,8 +4250,64 @@ static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg *cfg, return VKD3D_OK; } +static enum vkd3d_result vsir_cfg_append_loop(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *new_list, struct vsir_cfg_structure *loop) +{ + struct vsir_cfg_structure_list *loop_body = &loop->u.loop.body; + unsigned int target, loop_idx = loop->u.loop.idx; + struct vsir_cfg_structure *trailing_break; + enum vkd3d_result ret; + + trailing_break = vsir_cfg_get_trailing_break(loop_body); + + /* If the loop's last instruction is not a break, we cannot remove + * the loop itself. */ + if (!trailing_break) + { + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, loop, 1)) < 0) + return ret; + memset(loop, 0, sizeof(*loop)); + return VKD3D_OK; + } + + target = trailing_break->u.jump.target; + assert(cfg->loop_intervals[target].target_count > 0); + + /* If the loop is not targeted by any jump, we can remove it. The + * trailing `break' then targets another loop, so we have to keep + * it. */ + if (cfg->loop_intervals[loop_idx].target_count == 0) + { + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, + &loop_body->structures[0], loop_body->count)) < 0) + return ret; + loop_body->count = 0; + return VKD3D_OK; + } + + /* If the loop is targeted only by its own trailing `break' + * instruction, then we can remove it together with the `break' + * itself. */ + if (target == loop_idx && cfg->loop_intervals[loop_idx].target_count == 1) + { + --cfg->loop_intervals[loop_idx].target_count; + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, + &loop_body->structures[0], loop_body->count - 1)) < 0) + return ret; + loop_body->count = 0; + return VKD3D_OK; + } + + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, loop, 1)) < 0) + return ret; + memset(loop, 0, sizeof(*loop)); + + return VKD3D_OK; +} + static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) { + struct vsir_cfg_structure_list new_list = {0}; enum vkd3d_result ret; size_t i; @@ -4261,23 +4317,44 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct struct vsir_cfg_structure_list *loop_body; if (loop->type != STRUCTURE_TYPE_LOOP) + { + if ((ret = vsir_cfg_structure_list_append_from_region(&new_list, loop, 1)) < 0) + goto fail; + memset(loop, 0, sizeof(*loop)); continue; + } loop_body = &loop->u.loop.body; if (loop_body->count == 0) + { + if ((ret = vsir_cfg_structure_list_append_from_region(&new_list, loop, 1)) < 0) + goto fail; + memset(loop, 0, sizeof(*loop)); continue; + } vsir_cfg_remove_trailing_continue(cfg, loop_body, loop->u.loop.idx); if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) - return ret; + goto fail; if ((ret = vsir_cfg_synthesize_selections(cfg, loop_body)) < 0) - return ret; + goto fail; + + if ((ret = vsir_cfg_append_loop(cfg, &new_list, loop)) < 0) + goto fail; } + vsir_cfg_structure_list_cleanup(list); + *list = new_list; + return VKD3D_OK; + +fail: + vsir_cfg_structure_list_cleanup(list); + + return ret; } static void vsir_cfg_count_targets(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Move `break's out of selection constructs when possible.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: f5d1b5d263cda3c4db0195075733bb5eac30eb9d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f5d1b5d263cda3c4db0195075733b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 13 13:09:51 2024 +0100 vkd3d-shader/ir: Move `break's out of selection constructs when possible. --- libs/vkd3d-shader/ir.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 9d5b7904..450f753c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4115,6 +4115,71 @@ static void vsir_cfg_remove_trailing_continue(struct vsir_cfg_structure_list *li --list->count; } +static struct vsir_cfg_structure *vsir_cfg_get_trailing_break(struct vsir_cfg_structure_list *list) +{ + struct vsir_cfg_structure *structure; + size_t count = list->count; + + if (count == 0) + return NULL; + + structure = &list->structures[count - 1]; + + if (structure->type != STRUCTURE_TYPE_JUMP || structure->u.jump.type != JUMP_BREAK + || structure->u.jump.condition) + return NULL; + + return structure; +} + +/* When the last instruction in both branches of a selection construct + * is an unconditional break, any of them can be moved after the + * selection construct. If they break the same loop both of them can + * be moved out, otherwise we can choose which one: we choose the one + * that breaks the innermost loop, because we hope to eventually + * remove the loop itself. + * + * In principle a similar movement could be done when the last + * instructions are continue and continue, or continue and break. But + * in practice I don't think those situations can happen given the + * previous passes we do on the program, so we don't care. */ +static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg_structure_list *list) +{ + struct vsir_cfg_structure *selection, *if_break, *else_break, *new_break; + unsigned int if_target, else_target, max_target; + size_t pos = list->count - 1; + + selection = &list->structures[pos]; + assert(selection->type == STRUCTURE_TYPE_SELECTION); + + if_break = vsir_cfg_get_trailing_break(&selection->u.selection.if_body); + else_break = vsir_cfg_get_trailing_break(&selection->u.selection.else_body); + + if (!if_break || !else_break) + return VKD3D_OK; + + if_target = if_break->u.jump.target; + else_target = else_break->u.jump.target; + max_target = max(if_target, else_target); + + if (!(new_break = vsir_cfg_structure_list_append(list, STRUCTURE_TYPE_JUMP))) + return VKD3D_ERROR_OUT_OF_MEMORY; + new_break->u.jump.type = JUMP_BREAK; + new_break->u.jump.target = max_target; + + /* Pointer `selection' could have been invalidated by the append + * operation. */ + selection = &list->structures[pos]; + assert(selection->type == STRUCTURE_TYPE_SELECTION); + + if (if_target == max_target) + --selection->u.selection.if_body.count; + if (else_target == max_target) + --selection->u.selection.else_body.count; + + return VKD3D_OK; +} + static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structure_list *list) { enum vkd3d_result ret; @@ -4155,6 +4220,9 @@ static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg_structur if ((ret = vsir_cfg_synthesize_selections(&structure->u.selection.else_body)) < 0) return ret; + if ((ret = vsir_cfg_move_breaks_out_of_selections(list)) < 0) + return ret; + break; }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support refract() intrinsic.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 8d78e3a821f3770a359ee29e806b80cfd6e4eb15 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d78e3a821f3770a359ee29e806b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 7 14:16:15 2023 +0200 vkd3d-shader/hlsl: Support refract() intrinsic. With some changes by Giovanni Mascellani. --- libs/vkd3d-shader/hlsl.y | 54 ++++++++++++++++++++++++++++++++++++++++++ tests/hlsl/refract.shader_test | 42 ++++++++++++++++---------------- 2 files changed, 75 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 03e14d84..7fc35d4e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3740,6 +3740,59 @@ static bool intrinsic_reflect(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, i, neg, loc); } +static bool intrinsic_refract(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *r_type = params->args[0]->data_type; + struct hlsl_type *n_type = params->args[1]->data_type; + struct hlsl_type *i_type = params->args[2]->data_type; + struct hlsl_type *res_type, *idx_type, *scal_type; + struct parse_initializer mut_params; + struct hlsl_ir_function_decl *func; + enum hlsl_base_type base; + char *body; + + static const char template[] = + "%s refract(%s r, %s n, %s i)\n" + "{\n" + " %s d, t;\n" + " d = dot(r, n);\n" + " t = 1 - i.x * i.x * (1 - d * d);\n" + " return t >= 0.0 ? i.x * r - (i.x * d + sqrt(t)) * n : 0;\n" + "}"; + + if (r_type->class == HLSL_CLASS_MATRIX + || n_type->class == HLSL_CLASS_MATRIX + || i_type->class == HLSL_CLASS_MATRIX) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Matrix arguments are not supported."); + return false; + } + + assert(params->args_count == 3); + mut_params = *params; + mut_params.args_count = 2; + if (!(res_type = elementwise_intrinsic_get_common_type(ctx, &mut_params, loc))) + return false; + + base = expr_common_base_type(res_type->base_type, i_type->base_type); + base = base == HLSL_TYPE_HALF ? HLSL_TYPE_HALF : HLSL_TYPE_FLOAT; + res_type = convert_numeric_type(ctx, res_type, base); + idx_type = convert_numeric_type(ctx, i_type, base); + scal_type = hlsl_get_scalar_type(ctx, base); + + if (!(body = hlsl_sprintf_alloc(ctx, template, res_type->name, res_type->name, + res_type->name, idx_type->name, scal_type->name))) + return false; + + func = hlsl_compile_internal_function(ctx, "refract", body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -4255,6 +4308,7 @@ intrinsic_functions[] = {"pow", 2, true, intrinsic_pow}, {"radians", 1, true, intrinsic_radians}, {"reflect", 2, true, intrinsic_reflect}, + {"refract", 3, true, intrinsic_refract}, {"round", 1, true, intrinsic_round}, {"rsqrt", 1, true, intrinsic_rsqrt}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/hlsl/refract.shader_test b/tests/hlsl/refract.shader_test index ecd554b0..53af811f 100644 --- a/tests/hlsl/refract.shader_test +++ b/tests/hlsl/refract.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<6)] +[pixel shader] float4 r; float4 n; float i; @@ -12,13 +12,13 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 uniform 8 float 100.0 -todo(sm<6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 r; float4 n; float i; @@ -34,13 +34,13 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 r; float4 n; float i; @@ -55,13 +55,13 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 r; float4 n; float i; @@ -76,13 +76,13 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (-0.519904912, -0.4332699, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<6 | glsl) draw quad +todo(sm<4 | glsl) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 r; float4 n; float i; @@ -98,13 +98,13 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-0.524978, 0.0, 0.0, 0.0) 32 uniform 8 float 100.0 -todo(sm<6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo(sm<6)] +[pixel shader] float4 r; float4 n; float i; @@ -118,13 +118,13 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float 0.2 -todo(sm<6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-0.5562381, -0.6762381, -0.6162381, -0.5962381) 32 uniform 8 float 100.0 -todo(sm<6 | glsl) draw quad +todo(glsl) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader fail(sm>=6) todo(sm<6)] +[pixel shader fail(sm>=6)] float4 r; float4 n; float4 i; @@ -138,10 +138,10 @@ float4 main() : sv_target uniform 0 float4 0.5 -0.1 0.2 0.3 uniform 4 float4 0.6 0.4 -0.3 1.0 uniform 8 float4 0.2 0.3 0.4 0.5 -if(sm<6) todo(sm<6 | glsl) draw quad +if(sm<6) todo(glsl) draw quad if(sm<6) probe all rgba (-0.550931, -0.453954, 0.3654653, -1.0248856) 32 uniform 8 float 100.0 -if(sm<6) todo(sm<6 | glsl) draw quad +if(sm<6) todo(glsl) draw quad if(sm<6) probe all rgba (0.0, 0.0, 0.0, 0.0) [pixel shader fail]

1 0

Henri Verbeet : configure: Use AC_CHECK_TOOL to check for widl.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 2b7d9790d6da8055aefd1ab395335cabc002e71f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2b7d9790d6da8055aefd1ab395335… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 10 20:36:40 2024 +0200 configure: Use AC_CHECK_TOOL to check for widl. In particular, this will automatically pick up x86_64-w64-mingw32-widl/i686-w64-mingw32-widl (provided by mingw-w64-tools on Debian) when present and building for the corresponding hosts. --- m4/widl.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/widl.m4 b/m4/widl.m4 index 6d226064..2311b832 100644 --- a/m4/widl.m4 +++ b/m4/widl.m4 @@ -1,7 +1,7 @@ dnl VKD3D_PROG_WIDL(major, minor) AC_DEFUN([VKD3D_PROG_WIDL], -[AC_CHECK_PROG([WIDL], [widl], [widl], [no]) +[AC_CHECK_TOOL([WIDL], [widl], [no]) AS_IF([test "x$WIDL" != "xno"], [AC_MSG_CHECKING([checking whether widl version >= $1.$2])

1 0

Giovanni Mascellani : tests: Check that side effects do not happen after discard.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: e29706d3666e3d29e84e76d4deca3c07190d63da URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e29706d3666e3d29e84e76d4deca3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Mar 20 13:29:39 2024 +0100 tests: Check that side effects do not happen after discard. --- tests/hlsl/discard.shader_test | 50 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/tests/hlsl/discard.shader_test b/tests/hlsl/discard.shader_test index a5c210f0..cf53bf48 100644 --- a/tests/hlsl/discard.shader_test +++ b/tests/hlsl/discard.shader_test @@ -3,7 +3,8 @@ uniform float4 x; float4 main() : sv_target { - if (x.x == 9.0f) discard; + if (x.x == 9.0f) + discard; return x; } @@ -14,3 +15,50 @@ probe all rgba (1, 2, 3, 4) uniform 0 float4 9 8 7 6 todo(sm<4 | glsl) draw quad probe all rgba (1, 2, 3, 4) + +[require] +shader model >= 5.0 + +[uav 0] +format r32 float +size (2d, 2, 1) + +0.0 0.0 + +[uav 1] +format r32 float +size (2d, 2, 1) + +0.0 0.0 + +% Check that side effects stop happening after discard +[pixel shader] +uniform float4 x; +RWTexture2D<float> y; + +float4 main(float4 pos : sv_position) : sv_target +{ + if (pos.x == 0.5 && pos.y == 0.5) + y[uint2(0, 0)] += 1; + if (x.x == 9.0f) + discard; + if (pos.x == 0.5 && pos.y == 0.5) + y[uint2(1, 0)] += 1; + return x; +} + +[test] +uniform 0 float4 1 2 3 4 +todo(glsl) draw quad +probe all rgba (1, 2, 3, 4) +if(sm<6) probe uav 1 (0, 0) r (1.0) +if(sm<6) probe uav 1 (1, 0) r (1.0) +if(sm>=6) probe uav 0 (0, 0) r (1.0) +if(sm>=6) probe uav 0 (1, 0) r (1.0) +uniform 0 float4 9 8 7 6 +todo(glsl) draw quad +probe all rgba (1, 2, 3, 4) +if(sm<6) probe uav 1 (0, 0) r (2.0) +if(sm<6) probe uav 1 (1, 0) r (1.0) +if(sm>=6) probe uav 0 (0, 0) r (2.0) +if(sm>=6) probe uav 0 (1, 0) r (1.0)

1 0

Conor McCarthy : vkd3d: Validate that a resource with initial state RENDER_TARGET is a render target.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 9d7f63dc26b72132f36fde545aa997e1294b658a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9d7f63dc26b72132f36fde545aa99… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 9 17:26:32 2024 +1000 vkd3d: Validate that a resource with initial state RENDER_TARGET is a render target. --- libs/vkd3d/resource.c | 5 +++++ tests/d3d12.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 60dffe3d..17999914 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2003,6 +2003,11 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 WARN("Invalid initial resource state %#x.\n", initial_state); return E_INVALIDARG; } + if (initial_state == D3D12_RESOURCE_STATE_RENDER_TARGET && !(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET)) + { + WARN("Invalid initial resource state %#x for non-render-target.\n", initial_state); + return E_INVALIDARG; + } if (optimized_clear_value && d3d12_resource_is_buffer(resource)) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 69d72fb7..aaea5e31 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1634,9 +1634,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* A texture cannot be created on a UPLOAD heap. */ heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD;

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Consider the class in sm1_base_type().
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 285059ef11e4ce1e05a3ad1386f19706fc99ad74 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/285059ef11e4ce1e05a3ad1386f19… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 19:38:22 2024 -0600 vkd3d-shader/d3dbc: Consider the class in sm1_base_type(). We want the base type to stop being a property of all types, and to stop using the same enumeration for objects and numeric types. The backend should do the work of translation; we want a more sensible and convenient representation for the compiler itself. --- libs/vkd3d-shader/d3dbc.c | 132 +++++++++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 55 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 1ad97add..4685afa0 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1522,72 +1522,94 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) { - switch (type->base_type) + switch (type->class) { - case HLSL_TYPE_BOOL: - return D3DXPT_BOOL; - /* Actually double behaves differently depending on DLL version: - * For <= 36, it maps to D3DXPT_FLOAT. - * For 37-40, it maps to zero (D3DXPT_VOID). - * For >= 41, it maps to 39, which is D3D_SVT_DOUBLE (note D3D_SVT_* - * values are mostly compatible with D3DXPT_*). - * However, the latter two cases look like bugs, and a reasonable - * application certainly wouldn't know what to do with them. - * For fx_2_0 it's always D3DXPT_FLOAT regardless of DLL version. */ - case HLSL_TYPE_DOUBLE: - case HLSL_TYPE_FLOAT: - case HLSL_TYPE_HALF: - return D3DXPT_FLOAT; - case HLSL_TYPE_INT: - case HLSL_TYPE_UINT: - return D3DXPT_INT; - case HLSL_TYPE_PIXELSHADER: - return D3DXPT_PIXELSHADER; - case HLSL_TYPE_SAMPLER: - switch (type->sampler_dim) + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + switch (type->base_type) { - case HLSL_SAMPLER_DIM_1D: - return D3DXPT_SAMPLER1D; - case HLSL_SAMPLER_DIM_2D: - return D3DXPT_SAMPLER2D; - case HLSL_SAMPLER_DIM_3D: - return D3DXPT_SAMPLER3D; - case HLSL_SAMPLER_DIM_CUBE: - return D3DXPT_SAMPLERCUBE; - case HLSL_SAMPLER_DIM_GENERIC: - return D3DXPT_SAMPLER; + case HLSL_TYPE_BOOL: + return D3DXPT_BOOL; + /* Actually double behaves differently depending on DLL version: + * For <= 36, it maps to D3DXPT_FLOAT. + * For 37-40, it maps to zero (D3DXPT_VOID). + * For >= 41, it maps to 39, which is D3D_SVT_DOUBLE (note D3D_SVT_* + * values are mostly compatible with D3DXPT_*). + * However, the latter two cases look like bugs, and a reasonable + * application certainly wouldn't know what to do with them. + * For fx_2_0 it's always D3DXPT_FLOAT regardless of DLL version. */ + case HLSL_TYPE_DOUBLE: + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + return D3DXPT_FLOAT; + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + return D3DXPT_INT; default: - ERR("Invalid dimension %#x.\n", type->sampler_dim); vkd3d_unreachable(); } - break; - case HLSL_TYPE_STRING: - return D3DXPT_STRING; - case HLSL_TYPE_TEXTURE: - switch (type->sampler_dim) + + case HLSL_CLASS_OBJECT: + switch (type->base_type) { - case HLSL_SAMPLER_DIM_1D: - return D3DXPT_TEXTURE1D; - case HLSL_SAMPLER_DIM_2D: - return D3DXPT_TEXTURE2D; - case HLSL_SAMPLER_DIM_3D: - return D3DXPT_TEXTURE3D; - case HLSL_SAMPLER_DIM_CUBE: - return D3DXPT_TEXTURECUBE; - case HLSL_SAMPLER_DIM_GENERIC: - return D3DXPT_TEXTURE; + case HLSL_TYPE_PIXELSHADER: + return D3DXPT_PIXELSHADER; + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_1D: + return D3DXPT_SAMPLER1D; + case HLSL_SAMPLER_DIM_2D: + return D3DXPT_SAMPLER2D; + case HLSL_SAMPLER_DIM_3D: + return D3DXPT_SAMPLER3D; + case HLSL_SAMPLER_DIM_CUBE: + return D3DXPT_SAMPLERCUBE; + case HLSL_SAMPLER_DIM_GENERIC: + return D3DXPT_SAMPLER; + default: + ERR("Invalid dimension %#x.\n", type->sampler_dim); + vkd3d_unreachable(); + } + break; + case HLSL_TYPE_STRING: + return D3DXPT_STRING; + case HLSL_TYPE_TEXTURE: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_1D: + return D3DXPT_TEXTURE1D; + case HLSL_SAMPLER_DIM_2D: + return D3DXPT_TEXTURE2D; + case HLSL_SAMPLER_DIM_3D: + return D3DXPT_TEXTURE3D; + case HLSL_SAMPLER_DIM_CUBE: + return D3DXPT_TEXTURECUBE; + case HLSL_SAMPLER_DIM_GENERIC: + return D3DXPT_TEXTURE; + default: + ERR("Invalid dimension %#x.\n", type->sampler_dim); + vkd3d_unreachable(); + } + break; + case HLSL_TYPE_VERTEXSHADER: + return D3DXPT_VERTEXSHADER; + case HLSL_TYPE_VOID: + return D3DXPT_VOID; default: - ERR("Invalid dimension %#x.\n", type->sampler_dim); vkd3d_unreachable(); } - break; - case HLSL_TYPE_VERTEXSHADER: - return D3DXPT_VERTEXSHADER; - case HLSL_TYPE_VOID: - return D3DXPT_VOID; - default: vkd3d_unreachable(); + + case HLSL_CLASS_ARRAY: + return hlsl_sm1_base_type(type->e.array.type); + + case HLSL_CLASS_STRUCT: + return D3DXPT_VOID; } + + vkd3d_unreachable(); } static void write_sm1_type(struct vkd3d_bytecode_buffer *buffer, struct hlsl_type *type, unsigned int ctab_start)

1 0