April 2022 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Handle static struct initializer instructions.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 9c518b45d1b167cedf13d3d01dfb2ac75c411d6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9c518b45d1b167cedf13d3d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 14 12:52:37 2022 +0200 vkd3d-shader/hlsl: Handle static struct initializer instructions. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bdcdc780..f0a74826 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1644,11 +1644,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type == HLSL_CLASS_STRUCT) { struct_var_initializer(ctx, var, &v->initializer); - list_move_tail(statements_list, v->initializer.instrs); - - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; } else {

1 0

Francisco Casas : vkd3d-shader/hlsl: Support complex numeric initializers.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: aefadb87b67f78ca88fbd993f0b1dd6cae91ec49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aefadb87b67f78ca88fbd99… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 14 12:52:38 2022 +0200 vkd3d-shader/hlsl: Support complex numeric initializers. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 47 +++++++++++++++++++++++++++--- tests/hlsl-initializer-flatten.shader_test | 4 +-- tests/hlsl-initializer-nested.shader_test | 2 +- tests/hlsl-initializer-numeric.shader_test | 8 ++--- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f0a74826..58d71ff6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1447,6 +1447,39 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } +static void initialize_numeric_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct parse_initializer *initializer, unsigned int reg_offset, struct hlsl_type *type, + unsigned int *initializer_offset) +{ + unsigned int i; + + if (type->type == HLSL_CLASS_MATRIX) + hlsl_fixme(ctx, &var->loc, "Matrix initializer."); + + for (i = 0; i < type->dimx; i++) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *node; + + node = initializer->args[*initializer_offset]; + *initializer_offset += 1; + + if (!(node = add_implicit_conversion(ctx, initializer->instrs, node, + hlsl_get_scalar_type(ctx, type->base_type), &node->loc))) + return; + + if (!(c = hlsl_new_uint_constant(ctx, reg_offset + i, &node->loc))) + return; + list_add_tail(initializer->instrs, &c->node.entry); + + if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) + return; + + list_add_tail(initializer->instrs, &store->node.entry); + } +} + static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer) { @@ -1612,6 +1645,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.braces) { unsigned int size = initializer_size(&v->initializer); + unsigned int initializer_offset = 0; if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) { @@ -1647,10 +1681,15 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; + if (v->initializer.args_count != size) + { + hlsl_fixme(ctx, &v->loc, "Flatten initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + initialize_numeric_var(ctx, var, &v->initializer, 0, type, &initializer_offset); } } else diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test index 439ead5e..3a430e0d 100644 --- a/tests/hlsl-initializer-flatten.shader_test +++ b/tests/hlsl-initializer-flatten.shader_test @@ -37,8 +37,8 @@ float4 main() : sv_target } [test] -todo draw quad -probe all rgba (40, 10, 20, 30) +draw quad +todo probe all rgba (40, 10, 20, 30) [pixel shader] diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl-initializer-nested.shader_test index 0204afc9..bcb37cf4 100644 --- a/tests/hlsl-initializer-nested.shader_test +++ b/tests/hlsl-initializer-nested.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1, 2, 3, 4) diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test index 92117591..40576887 100644 --- a/tests/hlsl-initializer-numeric.shader_test +++ b/tests/hlsl-initializer-numeric.shader_test @@ -6,7 +6,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -18,7 +18,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -31,7 +31,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (1.0, 2.0, 3.0, 4.0) 4 @@ -44,5 +44,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (10.1, 1.1, 1.2, 2.1) 4

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant division.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 40b299c7276d03b1abe833649a942c74a8f9f4ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=40b299c7276d03b1abe8336… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:39 2022 +0200 vkd3d-shader/hlsl: Fold constant division. This commit includes work by Francisco Casas. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 67 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/arithmetic-float.shader_test | 16 ++++++++ tests/arithmetic-int.shader_test | 11 +++++- tests/arithmetic-uint.shader_test | 9 +++++ 5 files changed, 104 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 5cac4bde..9a8bc6b0 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -255,6 +255,69 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (src2->value[k].f == 0) + { + hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + "Floating point division by zero"); + } + dst->value[k].f = src1->value[k].f / src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + if (src2->value[k].d == 0) + { + hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + "Floating point division by zero"); + } + dst->value[k].d = src1->value[k].d / src2->value[k].d; + break; + + case HLSL_TYPE_INT: + if (src2->value[k].i == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + if (src1->value[k].i == INT_MIN && src2->value[k].i == -1) + dst->value[k].i = INT_MIN; + else + dst->value[k].i = src1->value[k].i / src2->value[k].i; + break; + + case HLSL_TYPE_UINT: + if (src2->value[k].u == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + dst->value[k].u = src1->value[k].u / src2->value[k].u; + break; + + default: + FIXME("Fold division for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -308,6 +371,10 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void success = fold_nequal(ctx, res, arg1, arg2); break; + case HLSL_OP2_DIV: + success = fold_div(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 21f23709..29e178cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -117,8 +117,10 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS = 5019, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, + VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO = 5021, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, + VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index d55dc9d4..f99b9728 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -23,3 +23,19 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[require] +shader model >= 4.0 + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 1; + float y = 0; + + return x / y; +} + +[test] +draw quad +probe all rgba (1e99, 1e99, 1e99, 1e99) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index 5d9cc029..c85b9a3a 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (20.0, -10.0, 75.0, 0.0) [pixel shader] @@ -23,3 +23,12 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader fail] +float4 main() : SV_TARGET +{ + int x = 1; + int y = 0; + + return x / y; +} diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test index b016dbb6..f37c881e 100644 --- a/tests/arithmetic-uint.shader_test +++ b/tests/arithmetic-uint.shader_test @@ -26,3 +26,12 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (5.0, 5.0, 4294967296.0, 3.0) + +[pixel shader fail] +float4 main() : SV_TARGET +{ + uint x = 1; + uint y = 0; + + return x / y; +}

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant modulus.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 2b23b7329c484d1b6c0bb37cbefe5b564283b06e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b23b7329c484d1b6c0bb37… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:40 2022 +0200 vkd3d-shader/hlsl: Fold constant modulus. This commit includes work by Francisco Casas. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_constant_ops.c | 48 +++++++++++++++++++++++++++++++++++ tests/arithmetic-int.shader_test | 11 +++++++- tests/arithmetic-uint.shader_test | 9 +++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9a8bc6b0..06b957ba 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -318,6 +318,50 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_mod(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_INT: + if (src2->value[k].i == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + if (src1->value[k].i == INT_MIN && src2->value[k].i == -1) + dst->value[k].i = 0; + else + dst->value[k].i = src1->value[k].i % src2->value[k].i; + break; + + case HLSL_TYPE_UINT: + if (src2->value[k].u == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + dst->value[k].u = src1->value[k].u % src2->value[k].u; + break; + + default: + FIXME("Fold modulus for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -375,6 +419,10 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void success = fold_div(ctx, res, arg1, arg2); break; + case HLSL_OP2_MOD: + success = fold_mod(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index c85b9a3a..c2eee2ba 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -21,7 +21,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [pixel shader fail] @@ -32,3 +32,12 @@ float4 main() : SV_TARGET return x / y; } + +[pixel shader fail] +float4 main() : SV_TARGET +{ + int x = 1; + int y = 0; + + return x % y; +} diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test index f37c881e..f1801b9c 100644 --- a/tests/arithmetic-uint.shader_test +++ b/tests/arithmetic-uint.shader_test @@ -35,3 +35,12 @@ float4 main() : SV_TARGET return x / y; } + +[pixel shader fail] +float4 main() : SV_TARGET +{ + uint x = 1; + uint y = 0; + + return x % y; +}

1 0

Giovanni Mascellani : tests: Test matrix indexing.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 564883a201f4bec05ff666f88f4766326f85c589 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=564883a201f4bec05ff666f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:41 2022 +0200 tests: Test matrix indexing. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/hlsl-matrix-indexing.shader_test | 47 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/Makefile.am b/Makefile.am index d57ea2b7..ed881ffa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,6 +85,7 @@ vkd3d_shader_tests = \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ + tests/hlsl-matrix-indexing.shader_test \ tests/hlsl-mul.shader_test \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test new file mode 100644 index 00000000..1d444ffa --- /dev/null +++ b/tests/hlsl-matrix-indexing.shader_test @@ -0,0 +1,47 @@ +[pixel shader] +uniform float4x4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 2.0, 10.0, 15.0) + +[pixel shader] +uniform column_major float4x4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 2.0, 10.0, 15.0) + +[pixel shader] +uniform row_major float4x4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0][0], m[1][0], m[1][2], m[2][3]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +uniform 8 float4 9.0 10.0 11.0 12.0 +uniform 12 float4 13.0 14.0 15.0 16.0 +todo draw quad +probe all rgba (1.0, 5.0, 7.0, 12.0)

1 0

Giovanni Mascellani : tests: Add another vector indexing test.
by Alexandre Julliard 15 Apr '22

15 Apr '22

Module: vkd3d Branch: master Commit: 16da0b33000b1af81161991e99f37983eb5c06f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16da0b33000b1af81161991… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:42 2022 +0200 tests: Add another vector indexing test. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/hlsl-vector-indexing.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index f46377cf..1c964147 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -12,3 +12,16 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (0.02, 0.245, 0.351, 1.0) + +[pixel shader] +uniform float4 m; + +float4 main() : SV_TARGET +{ + return float4(m[0], m[1], m[1], m[2]); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo draw quad +probe all rgba (1.0, 2.0, 2.0, 3.0)

1 0

Cressida Silver : WWN416
by Jeremy Newman 15 Apr '22

15 Apr '22

Module: website Branch: master Commit: b40bb11c8ccc012ebb826ad7260f1d72b1a81983 URL: https://source.winehq.org/git/website.git/?a=commit;h=b40bb11c8ccc012ebb826… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Apr 15 11:39:19 2022 -0500 WWN416 --- news/en/2022041502.xml | 14 + wwn/en/wn20220415_416.xml | 753 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 767 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=b40bb11c8ccc012eb…

1 0

Gabriel Ivăncescu : jscript: Use proper error description for invalid Set 'this'.
by Alexandre Julliard 14 Apr '22

14 Apr '22

1 0

Jacek Caban : win32u: Move EnableWindow implementation from user32.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 8b6a4584b80477f5dc43d71fe2dd16f7b1a135de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6a4584b80477f5dc43d71f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:10:56 2022 +0200 win32u: Move EnableWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/window.c | 37 +++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f5c22bfbadc..d44f058d256 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -869,35 +869,7 @@ HWND WINAPI GetDesktopWindow(void) */ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) { - BOOL retvalue; - - if (is_broadcast(hwnd)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - TRACE("( %p, %d )\n", hwnd, enable); - - if (enable) - { - retvalue = (WIN_SetStyle( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0; - if (retvalue) SendMessageW( hwnd, WM_ENABLE, TRUE, 0 ); - } - else - { - SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); - - retvalue = (WIN_SetStyle( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0; - if (!retvalue) - { - if (hwnd == GetFocus()) - NtUserSetFocus( 0 ); /* A disabled window can't have the focus */ - - SendMessageW( hwnd, WM_ENABLE, FALSE, 0 ); - } - } - return retvalue; + return NtUserEnableWindow( hwnd, enable ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 6eb272ec227..eefc48a7d2d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -807,6 +807,40 @@ BOOL is_window_unicode( HWND hwnd ) return ret; } +/* see EnableWindow */ +static BOOL enable_window( HWND hwnd, BOOL enable ) +{ + BOOL ret; + + if (is_broadcast(hwnd)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + TRACE( "( %p, %d )\n", hwnd, enable ); + + if (enable) + { + ret = (set_window_style( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0; + if (ret) send_message( hwnd, WM_ENABLE, TRUE, 0 ); + } + else + { + send_message( hwnd, WM_CANCELMODE, 0, 0 ); + + ret = (set_window_style( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0; + if (!ret) + { + if (hwnd == get_focus()) + NtUserSetFocus( 0 ); /* A disabled window can't have the focus */ + + send_message( hwnd, WM_ENABLE, FALSE, 0 ); + } + } + return ret; +} + /* see IsWindowEnabled */ BOOL is_window_enabled( HWND hwnd ) { @@ -5056,6 +5090,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) { switch (code) { + case NtUserCallHwndParam_EnableWindow: + return enable_window( hwnd, param ); + case NtUserCallHwndParam_GetClassLongA: return get_class_long( hwnd, param, TRUE ); diff --git a/include/ntuser.h b/include/ntuser.h index 52bc6c12c32..d8228a521e2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -832,6 +832,7 @@ static inline BOOL NtUserIsWindowVisible( HWND hwnd ) /* NtUserCallHwndParam codes, not compatible with Windows */ enum { + NtUserCallHwndParam_EnableWindow, NtUserCallHwndParam_GetClassLongA, NtUserCallHwndParam_GetClassLongW, NtUserCallHwndParam_GetClassLongPtrA, @@ -863,6 +864,11 @@ enum NtUserSpyGetMsgName, }; +static inline BOOL NtUserEnableWindow( HWND hwnd, BOOL enable ) +{ + return NtUserCallHwndParam( hwnd, enable, NtUserCallHwndParam_EnableWindow ); +} + static inline DWORD NtUserGetClassLongA( HWND hwnd, INT offset ) { return NtUserCallHwndParam( hwnd, offset, NtUserCallHwndParam_GetClassLongA );

1 0

Jacek Caban : win32u: Introduce NtUserMapWindowPoints.
by Alexandre Julliard 14 Apr '22

14 Apr '22

Module: wine Branch: master Commit: 11a75a65d705bf1d732ec6e3f2ee904f54cbce9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11a75a65d705bf1d732ec6e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 14:11:09 2022 +0200 win32u: Introduce NtUserMapWindowPoints. And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 22 ++-------------------- dlls/win32u/window.c | 7 +++++++ include/ntuser.h | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c38e0fabb1c..14511c22d9d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -356,27 +356,9 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI /******************************************************************* * MapWindowPoints (USER32.@) */ -INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) +INT WINAPI MapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) { - BOOL mirrored; - POINT offset; - UINT i; - - if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0; - - for (i = 0; i < count; i++) - { - lppt[i].x += offset.x; - lppt[i].y += offset.y; - if (mirrored) lppt[i].x = -lppt[i].x; - } - if (mirrored && count == 2) /* special case for rectangle */ - { - int tmp = lppt[0].x; - lppt[0].x = lppt[1].x; - lppt[1].x = tmp; - } - return MAKELONG( LOWORD(offset.x), LOWORD(offset.y) ); + return NtUserMapWindowPoints( hwnd_from, hwnd_to, points, count ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index eefc48a7d2d..3ecbc043fc8 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5151,6 +5151,13 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_KillSystemTimer: return kill_system_timer( hwnd, param ); + case NtUserCallHwndParam_MapWindowPoints: + { + struct map_window_points_params *params = (void *)param; + return map_window_points( hwnd, params->hwnd_to, params->points, params->count, + get_thread_dpi() ); + } + case NtUserCallHwndParam_MirrorRgn: return mirror_window_region( hwnd, UlongToHandle(param) ); diff --git a/include/ntuser.h b/include/ntuser.h index d8228a521e2..41abc1e2e14 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -852,6 +852,7 @@ enum NtUserCallHwndParam_GetWindowWord, NtUserCallHwndParam_IsChild, NtUserCallHwndParam_KillSystemTimer, + NtUserCallHwndParam_MapWindowPoints, NtUserCallHwndParam_MirrorRgn, NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, @@ -968,6 +969,23 @@ static inline BOOL NtUserKillSystemTimer( HWND hwnd, UINT_PTR id ) return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_KillSystemTimer ); } +struct map_window_points_params +{ + HWND hwnd_to; + POINT *points; + UINT count; +}; + +static inline int NtUserMapWindowPoints( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT count ) +{ + struct map_window_points_params params; + params.hwnd_to = hwnd_to; + params.points = points; + params.count = count; + return NtUserCallHwndParam( hwnd_from, (UINT_PTR)&params, + NtUserCallHwndParam_MapWindowPoints ); +} + static inline BOOL NtUserMirrorRgn( HWND hwnd, HRGN hrgn ) { return NtUserCallHwndParam( hwnd, HandleToUlong(hrgn), NtUserCallHwndParam_MirrorRgn );

1 0