November 2023 - Wine-Commits

Nikolay Sivov : vkd3d-shader: Add constant folding for 'floor'.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 4778d051df2d8a92a729751c15cfff6355459958 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4778d051df2d8a92a729751c15cff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 18 00:08:02 2023 +0200 vkd3d-shader: Add constant folding for 'floor'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ tests/hlsl/floor.shader_test | 10 ++++++++++ 2 files changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index c869dc02..b76b1fce 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -280,6 +280,32 @@ static bool fold_exp2(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } +static bool fold_floor(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = floorf(src->value.u[k].f); + break; + + default: + FIXME("Fold 'floor' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_fract(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { @@ -1263,6 +1289,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_exp2(ctx, &res, instr->data_type, arg1); break; + case HLSL_OP1_FLOOR: + success = fold_floor(ctx, &res, instr->data_type, arg1); + break; + case HLSL_OP1_FRACT: success = fold_fract(ctx, &res, instr->data_type, arg1); break; diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index deb9acf9..e6562c4a 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -1,3 +1,13 @@ +[pixel shader] +float4 main() : sv_target +{ + return floor(float4(-0.5, 6.5, 7.5, 3.4)); +} + +[test] +draw quad +probe all rgba (-1.0, 6.0, 7.0, 3.0) 4 + [pixel shader] uniform float4 u;

1 0

Henri Verbeet : vkd3d-compiler: Sort the options in the usage text.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 375b3e0db3c87dbc261c15a51e32eed23399c0ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/375b3e0db3c87dbc261c15a51e32e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:22:10 2023 +0100 vkd3d-compiler: Sort the options in the usage text. --- programs/vkd3d-compiler/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 51eb15e8..2d10baca 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -182,19 +182,19 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" - " --matrix-storage-order=<order>\n" - " Specify default matrix storage order. Valid values are\n" - " 'column' (default) and 'row'.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" - " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" - " output file is specified, output will be written to\n" - " standard output.\n" " --formatting=<flags> Specify the formatting options for text output.\n" " <flags> is a comma separated list of formatting flags,\n" " optionally prefixed by '+' or '-'. Valid flags are\n" " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" " The 'indent' and 'header' flags are enabled by default.\n" + " --matrix-storage-order=<order>\n" + " Specify the default matrix storage order. Valid values\n" + " are 'column' (default) and 'row'.\n" + " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" + " output file is specified, output will be written to\n" + " standard output.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n"

1 0

Henri Verbeet : vkd3d: Report D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE for UAV formats.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: c5cc46739469c06bd4a89c976f437ed9093474c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c5cc46739469c06bd4a89c976f437… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 7 23:35:28 2023 +0100 vkd3d: Report D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE for UAV formats. --- libs/vkd3d/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2be5e103..ec5a921c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2934,6 +2934,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device5 data->Support1 |= D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; if (device->vk_info.uav_read_without_format) data->Support2 |= D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD; + /* We effectively require shaderStorageImageWriteWithoutFormat, + * so we can just report UAV_TYPED_STORE unconditionally. */ + data->Support2 |= D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE; } if (image_features & VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT)

1 0

Henri Verbeet : vkd3d-compiler: Slightly reword the --semantic-compat-map usage text.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 4c4843126e0a8f3d6c309554f4f53b01757ad277 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c4843126e0a8f3d6c309554f4f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:28:47 2023 +0100 vkd3d-compiler: Slightly reword the --semantic-compat-map usage text. --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2e5f2b97..51eb15e8 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -185,8 +185,6 @@ static void print_usage(const char *program_name) " --matrix-storage-order=<order>\n" " Specify default matrix storage order. Valid values are\n" " 'column' (default) and 'row'.\n" - " --semantic-compat-map Enable semantic mapping compatibility mode to use SM4+ system values\n" - " instead of SM1-3 style semantic names when compiling from HLSL sources.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" @@ -201,6 +199,8 @@ static void print_usage(const char *program_name) " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" + " --semantic-compat-map Map shader model 1-3 semantic names to shader model 4+\n" + " system values when compiling HLSL sources.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Use --print-source-types\n"

1 0

Henri Verbeet : vkd3d: Report D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD for UAV formats when we have "uav_read_without_format".
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 000843b7c80f22dca0d8a88bf0688ca4c25b6ca9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/000843b7c80f22dca0d8a88bf0688… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 7 23:28:43 2023 +0100 vkd3d: Report D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD for UAV formats when we have "uav_read_without_format". --- libs/vkd3d/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2d7051f3..2be5e103 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2930,7 +2930,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device5 if (image_features & VK_FORMAT_FEATURE_BLIT_SRC_BIT) data->Support1 |= D3D12_FORMAT_SUPPORT1_MULTISAMPLE_RESOLVE; if (image_features & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) + { data->Support1 |= D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; + if (device->vk_info.uav_read_without_format) + data->Support2 |= D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD; + } if (image_features & VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT) data->Support2 |= D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_ADD

1 0

Nikolay Sivov : vkd3d-shader: Add a missing entry to instruction debug print helper.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 634ec96b52bcc2a13ad3485739b1947238eaafc0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/634ec96b52bcc2a13ad3485739b19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 18 00:01:51 2023 +0200 vkd3d-shader: Add a missing entry to instruction debug print helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e036f05a..c3a7a604 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2572,6 +2572,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_DSY_COARSE] = "dsy_coarse", [HLSL_OP1_DSY_FINE] = "dsy_fine", [HLSL_OP1_EXP2] = "exp2", + [HLSL_OP1_FLOOR] = "floor", [HLSL_OP1_FRACT] = "fract", [HLSL_OP1_LOG2] = "log2", [HLSL_OP1_LOGIC_NOT] = "!",

1 0

Nikolay Sivov : vkd3d-shader: Add support for floor() on SM1-3.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 9a70ae5b6aea0d955e3938fcc894af8cc1f53361 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a70ae5b6aea0d955e3938fcc894a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 23:26:04 2023 +0200 vkd3d-shader: Add support for floor() on SM1-3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index cd6c1ff8..aa8b5862 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2714,6 +2714,35 @@ static bool lower_ceil(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct return true; } +/* Lower FLOOR to FRC */ +static bool lower_floor(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_node *arg, *neg, *sum, *frc; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + + expr = hlsl_ir_expr(instr); + arg = expr->operands[0].node; + if (expr->op != HLSL_OP1_FLOOR) + return false; + + if (!(frc = hlsl_new_unary_expr(ctx, HLSL_OP1_FRACT, arg, &instr->loc))) + return false; + hlsl_block_add_instr(block, frc); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, frc, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); + + if (!(sum = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, neg, arg))) + return false; + hlsl_block_add_instr(block, sum); + + return true; +} + /* Use 'movc' for the ternary operator. */ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { @@ -4881,6 +4910,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_dot, body); lower_ir(ctx, lower_round, body); lower_ir(ctx, lower_ceil, body); + lower_ir(ctx, lower_floor, body); } if (profile->major_version < 2)

1 0

Nikolay Sivov : vkd3d-shader: Add support for ceil() on SM1-3.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: aaef82e6805f46806532099d5d1ae68b8c0d0f58 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aaef82e6805f46806532099d5d1ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 23:22:52 2023 +0200 vkd3d-shader: Add support for ceil() on SM1-3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 570591a6..cd6c1ff8 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2685,6 +2685,35 @@ static bool lower_round(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct return true; } +/* Lower CEIL to FRC */ +static bool lower_ceil(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_node *arg, *neg, *sum, *frc; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + + expr = hlsl_ir_expr(instr); + arg = expr->operands[0].node; + if (expr->op != HLSL_OP1_CEIL) + return false; + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); + + if (!(frc = hlsl_new_unary_expr(ctx, HLSL_OP1_FRACT, neg, &instr->loc))) + return false; + hlsl_block_add_instr(block, frc); + + if (!(sum = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, frc, arg))) + return false; + hlsl_block_add_instr(block, sum); + + return true; +} + /* Use 'movc' for the ternary operator. */ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { @@ -4851,6 +4880,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_sqrt, body); lower_ir(ctx, lower_dot, body); lower_ir(ctx, lower_round, body); + lower_ir(ctx, lower_ceil, body); } if (profile->major_version < 2)

1 0

Nikolay Sivov : vkd3d-shader/tpf: Add support for ceil().
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 494f681bf6d9ce2f1b4500a844e0f42137ab86c1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/494f681bf6d9ce2f1b4500a844e0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 23:41:54 2023 +0200 vkd3d-shader/tpf: Add support for ceil(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/tpf.c | 5 +++++ tests/hlsl/ceil.shader_test | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index a9d89bd7..3c8096d5 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4931,6 +4931,11 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex write_sm4_cast(tpf, expr); break; + case HLSL_OP1_CEIL: + assert(type_is_float(dst_type)); + write_sm4_unary_op(tpf, VKD3D_SM4_OP_ROUND_PI, &expr->node, arg1, 0); + break; + case HLSL_OP1_COS: assert(type_is_float(dst_type)); write_sm4_unary_op_with_two_destinations(tpf, VKD3D_SM4_OP_SINCOS, &expr->node, 1, arg1); diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test index 266a63db..0ff9938b 100644 --- a/tests/hlsl/ceil.shader_test +++ b/tests/hlsl/ceil.shader_test @@ -1,14 +1,14 @@ -[pixel shader todo] +[pixel shader] float4 main() : sv_target { return ceil(float4(-0.5, 6.5, 7.5, 3.4)); } [test] -todo(sm<6) draw quad -todo(sm<6) probe all rgba (0.0, 7.0, 8.0, 4.0) 4 +draw quad +probe all rgba (0.0, 7.0, 8.0, 4.0) 4 -[pixel shader todo] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -18,10 +18,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -todo draw quad -todo probe all rgba (0.0, 7.0, 8.0, 4.0) 4 +todo(sm>=6) draw quad +probe all rgba (0.0, 7.0, 8.0, 4.0) 4 -[pixel shader todo] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -34,13 +34,13 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -todo draw quad -todo probe all rgba (7.0, 8.0, 0.0, 4.0) 4 +todo(sm>=6) draw quad +probe all rgba (7.0, 8.0, 0.0, 4.0) 4 [require] shader model >= 4.0 -[pixel shader todo] +[pixel shader] uniform int4 u; float4 main() : sv_target @@ -53,5 +53,5 @@ float4 main() : sv_target [test] uniform 0 int4 -1 6 7 3 -todo draw quad -todo probe all rgba (6.0, 7.0, -1.0, 3.0) 4 +todo(sm>=6) draw quad +probe all rgba (6.0, 7.0, -1.0, 3.0) 4

1 0

Nikolay Sivov : vkd3d-shader: Add constant folding for 'ceil'.
by Alexandre Julliard Nov. 8, 2023

Nov. 8, 2023

Module: vkd3d Branch: master Commit: 955932fb55d7cd3be314ebbaa1c922d3d88095f4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/955932fb55d7cd3be314ebbaa1c92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 23:57:46 2023 +0200 vkd3d-shader: Add constant folding for 'ceil'. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 64629dc2..c869dc02 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -228,6 +228,32 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, return true; } +static bool fold_ceil(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, + const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) +{ + enum hlsl_base_type type = dst_type->base_type; + unsigned int k; + + assert(type == src->node.data_type->base_type); + + for (k = 0; k < dst_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = ceilf(src->value.u[k].f); + break; + + default: + FIXME("Fold 'ceil' for type %s.\n", debug_hlsl_type(ctx, dst_type)); + return false; + } + } + + return true; +} + static bool fold_exp2(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src) { @@ -1229,6 +1255,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_cast(ctx, &res, instr->data_type, arg1); break; + case HLSL_OP1_CEIL: + success = fold_ceil(ctx, &res, instr->data_type, arg1); + break; + case HLSL_OP1_EXP2: success = fold_exp2(ctx, &res, instr->data_type, arg1); break;

1 0