October 2022 - Wine-Commits

Francisco Casas : tests: Test explicit casts between types that are component-wise compatible.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 09d7442cb18340ee2e8f85aa67882abaf1528e1e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09d7442cb18340ee2e8f85aa67882… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 17:01:26 2022 -0300 tests: Test explicit casts between types that are component-wise compatible. --- Makefile.am | 1 + tests/cast-componentwise-compatible.shader_test | 185 ++++++++++++++++++++++++ 2 files changed, 186 insertions(+) diff --git a/Makefile.am b/Makefile.am index 83f75d64..b9068728 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-equal.shader_test \ + tests/cast-componentwise-compatible.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test new file mode 100644 index 00000000..c6402cf5 --- /dev/null +++ b/tests/cast-componentwise-compatible.shader_test @@ -0,0 +1,185 @@ +[pixel shader] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = (struct apple) f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader] +struct apple +{ + float3 aa; + int bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8.8, 9.0}; + float f[4]; + + f = (float[4]) a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float f[6] = {1, 2, 3, 4, 5, 6}; + int i[4]; + + i = (int[4]) f; + return float4(i[0], i[1], i[2], i[3]); +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 7.2}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (7.0, 7.0, 7.0, 7.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; + float4 dd; + Texture2D ee; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 3, 4, 5, 6, 7, tex}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (3.0, 3.0, 3.0, 3.0) + + +[pixel shader fail] +struct apple +{ + int2 aa; + float bb; +}; + +struct banana +{ + int2 aa; + float bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3}; + struct banana b; + + b = (struct banana) a; + return b.bb; +} + + +[pixel shader] +float4 main() : sv_target +{ + float4 v = float4(10.1, 20.2, 30.3, 40.4); + int i[3]; + + i = (int[3]) v; + return float4(i[0], i[1], i[2], i[2]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 20.0, 30.0, 30.0) + + +[pixel shader] +struct apple +{ + int aa; + float bb[2]; +}; + +float4 main() : sv_target +{ + float4 f = {10.4, 11.4, 12.4, 13.4}; + struct apple a; + + a = (struct apple) f; + return float4(a.aa, a.aa, a.bb[0], a.bb[1]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 10.0, 11.4, 12.4)

1 0

Francisco Casas : tests: Test implicit casts between types that are equal component-wise.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 653b109d8f44dfc7287b5389d95a04c9bc732e21 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/653b109d8f44dfc7287b5389d95a0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 12:39:06 2022 -0300 tests: Test implicit casts between types that are equal component-wise. --- Makefile.am | 1 + tests/cast-componentwise-equal.shader_test | 226 +++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) diff --git a/Makefile.am b/Makefile.am index a0cd584f..83f75d64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ + tests/cast-componentwise-equal.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test new file mode 100644 index 00000000..ac329112 --- /dev/null +++ b/tests/cast-componentwise-equal.shader_test @@ -0,0 +1,226 @@ +[pixel shader fail] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float4 f = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader fail] +struct apple +{ + float aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2}; + float2 f; + + f = a; + return f.xyxy; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8}; + float f[4]; + + f = a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 4}; + struct banana b; + + b = a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (4.0, 4.0, 4.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 fun(struct banana b) +{ + return b.cc; +} + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 5}; + + return fun(a); +} + +[test] +todo draw quad +todo probe all rgba (5.0, 5.0, 5.0, 5.0) + + +[pixel shader] +struct apple +{ + float3 xx[2]; + int4 yy; +}; + +struct banana +{ + struct apple apples[2]; + int3 bb[2]; + int4 cc[3]; +}; + +struct cherry +{ + int2 xx; + int yy[3]; +}; + +struct donut +{ + float4 aa; + float2 bb; + int cc[4]; + float dd[6]; + struct cherry cherries[4]; + int2 ee; +}; + +float4 main() : sv_target +{ + struct banana b = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37}; + struct donut d; + + d = b; + return d.aa + d.cherries[3].yy[2] + d.ee.xyxx; +} + +[test] +todo draw quad +todo probe all rgba (71.0, 73.0, 73.0, 74.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +struct banana +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3, 4}; + struct banana b; + + b = a; + return b.bb; +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Always go through implicit conversion in assignments.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 5a1b0dbf44dea826a3f95d2c1cad023207c491a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a1b0dbf44dea826a3f95d2c1cad0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 14:43:26 2022 -0300 vkd3d-shader/hlsl: Always go through implicit conversion in assignments. Otherwise we silently skip some type checks. --- libs/vkd3d-shader/hlsl.y | 6 ++---- tests/cast-broadcast.shader_test | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b804b45c..03004c60 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1636,12 +1636,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) - { writemask = (1 << lhs_type->dimx) - 1; - if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) - return NULL; - } + if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) + return NULL; while (lhs->type != HLSL_IR_LOAD) { diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index f60eb758..e21e65b0 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -23,7 +23,7 @@ todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) -[pixel shader fail todo] +[pixel shader fail] struct apple { float3 aa;

1 0

Francisco Casas : tests: Test for invalid complex broadcasts.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: e56db9bda5d11acd746449552da3aae9f5feb81b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e56db9bda5d11acd746449552da3a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 19:23:00 2022 -0300 tests: Test for invalid complex broadcasts. --- tests/cast-broadcast.shader_test | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 26ae7997..f60eb758 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -21,3 +21,50 @@ float4 main() : SV_TARGET [test] todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) + + +[pixel shader fail todo] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 main() : SV_TARGET +{ + struct apple f = 31; + return f.bb; +} + + +[pixel shader fail] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 fun(struct apple f) +{ + return f.bb; +} + +float4 main() : SV_TARGET +{ + return fun(31); +} + + +[pixel shader fail] +struct apple +{ + float4 foo; + Texture2D tex; +}; + +float4 PSMain() : SV_TARGET +{ + struct apple a1; + a1 = (struct apple)1; + return a1.foo; +}

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse length() intrinsic.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 8e5aefb30989a22a2472a9dfb82ec1706d1e3d98 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e5aefb30989a22a2472a9dfb82ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 1 10:54:03 2021 +0200 vkd3d-shader/hlsl: Parse length() intrinsic. --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 60ca09ce..b804b45c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2188,6 +2188,31 @@ static bool intrinsic_ldexp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); } +static bool intrinsic_length(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = params->args[0]->data_type; + struct hlsl_ir_node *arg, *dot; + + if (type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, arg, arg, loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc); +} + static bool intrinsic_lerp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2407,6 +2432,7 @@ intrinsic_functions[] = {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, {"ldexp", 2, true, intrinsic_ldexp}, + {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min},

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 square root instructions.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 5442f4236c0387765b9346de7275f99de709ce86 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5442f4236c0387765b9346de7275f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 4 23:40:30 2022 +0200 vkd3d-shader/hlsl: Write SM4 square root instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/hlsl-length.shader_test | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index b6d5e92c..aa89b6a0 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1685,6 +1685,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, &expr->node, arg1, 0); break; + case HLSL_OP1_SQRT: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_SQRT, &expr->node, arg1, 0); + break; + case HLSL_OP2_ADD: switch (dst_type->base_type) { diff --git a/tests/hlsl-length.shader_test b/tests/hlsl-length.shader_test index e9f7c8ae..d5a708e2 100644 --- a/tests/hlsl-length.shader_test +++ b/tests/hlsl-length.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 -todo draw quad +draw quad probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 -todo draw quad +draw quad probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail]

1 0

Francisco Casas : tests: Rename structs for readability in broadcast test.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 791f8a8faa6c2c3fa9bda293f4982bef407bdc6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/791f8a8faa6c2c3fa9bda293f4982… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 11:09:36 2022 -0300 tests: Rename structs for readability in broadcast test. --- tests/cast-broadcast.shader_test | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 02d14c0b..26ae7997 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -1,21 +1,20 @@ [pixel shader] - -struct foo +struct apple { float3 aa; float4 bb; }; -struct bar +struct banana { - struct foo aa; + struct apple aa; int2 bb; int4 cc[8]; }; float4 main() : SV_TARGET { - struct bar p = (struct bar)42; + struct banana p = (struct banana)42; return p.aa.bb + p.cc[5]; }

1 0

Francisco Casas : tests: Set ULPs to 2 in normalize() test.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 3bae0c92c7e6eeb21acebd60e9229bb23dc8998d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3bae0c92c7e6eeb21acebd60e9229… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 20:55:15 2022 -0300 tests: Set ULPs to 2 in normalize() test. Otherwise the test fails on a NVIDIA GeForce GTX 1050 Ti GPU. The error being: shader_runner:535:Section [test], line 9: Test failed: Got {2.72165507e-01, 4.08248246e-01, 5.44331014e-01, 6.80413783e-01}, expected {2.72165537e-01, 4.08248305e-01, 5.44331074e-01, 6.80413842e-01} at (0, 0). --- tests/hlsl-normalize.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hlsl-normalize.shader_test b/tests/hlsl-normalize.shader_test index 71b900e8..359a7590 100644 --- a/tests/hlsl-normalize.shader_test +++ b/tests/hlsl-normalize.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 draw quad -probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 1 +probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] uniform float3 x;

1 0

Giovanni Mascellani : tests: Test int absolute value.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: ef4990d9966df3aeb17a517582d97b0f770e9b9b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef4990d9966df3aeb17a517582d97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 5 13:59:43 2022 +0200 tests: Test int absolute value. --- tests/arithmetic-int-uniform.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index ff80a9b0..643c910b 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -27,3 +27,16 @@ float4 main() : SV_TARGET uniform 0 float4 5.0 16.0 0.0 0.0 todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader] +uniform float4 a; + +float4 main() : SV_TARGET +{ + return abs(int4(a)); +} + +[test] +uniform 0 float4 5.0 -7.0 0.0 -10.0 +todo draw quad +probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int absolute value.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: vkd3d Branch: master Commit: 4c13ae576403b9e6f516eefa3a93ba25fe221779 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c13ae576403b9e6f516eefa3a93b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 21 17:21:44 2021 +0200 vkd3d-shader/hlsl: Lower int absolute value. --- libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 289c5a11..ef67e39b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1284,6 +1284,35 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type; + struct hlsl_ir_node *arg, *neg; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (expr->op != HLSL_OP1_ABS) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + + arg = expr->operands[0].node; + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + expr->op = HLSL_OP2_MAX; + hlsl_src_from_node(&expr->operands[1], neg); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -2268,6 +2297,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); + transform_ir(ctx, lower_int_abs, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index 643c910b..f7fe8291 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -38,5 +38,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -todo draw quad +draw quad probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0