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

Francisco Casas : tests: Test indexing of non-loads.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 8cd3defe0d6e82ea6de64d7c3fa0cd4385c2b448 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8cd3defe0d6e82ea6de64d7c3fa0c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 9 21:08:16 2023 -0300 tests: Test indexing of non-loads. --- Makefile.am | 1 + tests/expr-indexing.shader_test | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/Makefile.am b/Makefile.am index 46057965..bff65a85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/distance.shader_test \ tests/entry-point-semantics.shader_test \ tests/exp.shader_test \ + tests/expr-indexing.shader_test \ tests/floor.shader_test \ tests/frac.shader_test \ tests/function-return.shader_test \ diff --git a/tests/expr-indexing.shader_test b/tests/expr-indexing.shader_test new file mode 100644 index 00000000..83a63d67 --- /dev/null +++ b/tests/expr-indexing.shader_test @@ -0,0 +1,103 @@ +[pixel shader] +float4 a, b; + +float4 main() : sv_target +{ + return (a + b)[1]; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float4 5.0 6.0 7.0 8.0 +draw quad +probe all rgba (8.0, 8.0, 8.0, 8.0) + + +[pixel shader todo] +float4 a, b; +float i; + +float4 main() : sv_target +{ + return (a + b)[i]; +} + +[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 float 2 +todo draw quad +todo probe all rgba (10.0, 10.0, 10.0, 10.0) + + +[pixel shader] +float4 a; + +float4 main() : sv_target +{ + return a.wyxz[3]; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (3.0, 3.0, 3.0, 3.0) + + +[pixel shader todo] +float4 a; +float i; + +float4 main() : sv_target +{ + return a.wyxz[i]; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float 0 +todo draw quad +todo probe all rgba (4.0, 4.0, 4.0, 4.0) +uniform 4 float 2 +todo draw quad +todo probe all rgba (1.0, 1.0, 1.0, 1.0) + + +[pixel shader] +float4 a; + +float4 foo() +{ + return a; +} + +float4 main() : sv_target +{ + return foo()[3]; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (4.0, 4.0, 4.0, 4.0) + + +[pixel shader todo] +float4 a; +float i; + +float4 foo() +{ + return a; +} + +float4 main() : sv_target +{ + return foo()[i]; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +uniform 4 float 1 +todo draw quad +todo probe all rgba (2.0, 2.0, 2.0, 2.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Introduce hlsl_ir_index.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 741c9e5893d1fcfc36d10e300e9377eb97c46559 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/741c9e5893d1fcfc36d10e300e937… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Feb 24 16:39:56 2023 -0300 vkd3d-shader/hlsl: Introduce hlsl_ir_index. This node type is intended for use during parse-time. While we parse an indexing expression such as "a[3]", we don't know if it will end up as part of an expression (in which case it must be folded into a load) or it is for the lhs of a store (in which case it must be folded into the store's deref). --- libs/vkd3d-shader/hlsl.c | 60 ++++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 15 ++++++++++ libs/vkd3d-shader/hlsl.y | 1 + libs/vkd3d-shader/hlsl_codegen.c | 9 ++++++ 4 files changed, 85 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 85b6ba8c..36ff4b63 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1281,6 +1281,28 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned return swizzle; } +struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *val, + struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = val->data_type; + struct hlsl_ir_index *index; + + if (!(index = hlsl_alloc(ctx, sizeof(*index)))) + return NULL; + + if (type->class == HLSL_CLASS_OBJECT) + type = type->e.resource_format; + else if (type->class == HLSL_CLASS_MATRIX) + type = hlsl_get_vector_type(ctx, type->base_type, type->dimx); + else + type = hlsl_get_element_type_from_path_index(ctx, type, idx); + + init_node(&index->node, HLSL_IR_INDEX, type, loc); + hlsl_src_from_node(&index->val, val); + hlsl_src_from_node(&index->idx, idx); + return &index->node; +} + struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) { struct hlsl_ir_jump *jump; @@ -1540,6 +1562,17 @@ static struct hlsl_ir_node *clone_swizzle(struct hlsl_ctx *ctx, return &dst->node; } +static struct hlsl_ir_node *clone_index(struct hlsl_ctx *ctx, struct clone_instr_map *map, + struct hlsl_ir_index *src) +{ + struct hlsl_ir_node *dst; + + if (!(dst = hlsl_new_index(ctx, map_instr(map, src->val.node), map_instr(map, src->idx.node), + &src->node.loc))) + return NULL; + return dst; +} + static struct hlsl_ir_node *clone_instr(struct hlsl_ctx *ctx, struct clone_instr_map *map, const struct hlsl_ir_node *instr) { @@ -1557,6 +1590,9 @@ static struct hlsl_ir_node *clone_instr(struct hlsl_ctx *ctx, case HLSL_IR_IF: return clone_if(ctx, map, hlsl_ir_if(instr)); + case HLSL_IR_INDEX: + return clone_index(ctx, map, hlsl_ir_index(instr)); + case HLSL_IR_JUMP: return clone_jump(ctx, hlsl_ir_jump(instr)); @@ -1946,6 +1982,7 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) "HLSL_IR_CONSTANT", "HLSL_IR_EXPR", "HLSL_IR_IF", + "HLSL_IR_INDEX", "HLSL_IR_LOAD", "HLSL_IR_LOOP", "HLSL_IR_JUMP", @@ -2324,6 +2361,14 @@ static void dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hls } } +static void dump_ir_index(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_index *index) +{ + dump_src(buffer, &index->val); + vkd3d_string_buffer_printf(buffer, "[idx:"); + dump_src(buffer, &index->idx); + vkd3d_string_buffer_printf(buffer, "]"); +} + static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) { if (instr->index) @@ -2351,6 +2396,10 @@ static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, dump_ir_if(ctx, buffer, hlsl_ir_if(instr)); break; + case HLSL_IR_INDEX: + dump_ir_index(buffer, hlsl_ir_index(instr)); + break; + case HLSL_IR_JUMP: dump_ir_jump(buffer, hlsl_ir_jump(instr)); break; @@ -2525,6 +2574,13 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) vkd3d_free(swizzle); } +static void free_ir_index(struct hlsl_ir_index *index) +{ + hlsl_src_remove(&index->val); + hlsl_src_remove(&index->idx); + vkd3d_free(index); +} + void hlsl_free_instr(struct hlsl_ir_node *node) { assert(list_empty(&node->uses)); @@ -2547,6 +2603,10 @@ void hlsl_free_instr(struct hlsl_ir_node *node) free_ir_if(hlsl_ir_if(node)); break; + case HLSL_IR_INDEX: + free_ir_index(hlsl_ir_index(node)); + break; + case HLSL_IR_JUMP: free_ir_jump(hlsl_ir_jump(node)); break; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3e631dd9..d85ae6e3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -254,6 +254,7 @@ enum hlsl_ir_node_type HLSL_IR_CONSTANT, HLSL_IR_EXPR, HLSL_IR_IF, + HLSL_IR_INDEX, HLSL_IR_LOAD, HLSL_IR_LOOP, HLSL_IR_JUMP, @@ -544,6 +545,12 @@ struct hlsl_ir_swizzle DWORD swizzle; }; +struct hlsl_ir_index +{ + struct hlsl_ir_node node; + struct hlsl_src val, idx; +}; + /* Reference to a variable, or a part of it (e.g. a vector within a matrix within a struct). */ struct hlsl_deref { @@ -857,6 +864,12 @@ static inline struct hlsl_ir_swizzle *hlsl_ir_swizzle(const struct hlsl_ir_node return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); } +static inline struct hlsl_ir_index *hlsl_ir_index(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_INDEX); + return CONTAINING_RECORD(node, struct hlsl_ir_index, node); +} + static inline void hlsl_block_init(struct hlsl_block *block) { list_init(&block->instrs); @@ -1072,6 +1085,8 @@ struct hlsl_ir_store *hlsl_new_store_index(struct hlsl_ctx *ctx, const struct hl struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl_block *block, const struct hlsl_deref *lhs, unsigned int comp, struct hlsl_ir_node *rhs); +struct hlsl_ir_node *hlsl_new_index(struct hlsl_ctx *ctx, struct hlsl_ir_node *val, + struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc); struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc); struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, const struct hlsl_resource_load_params *params, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ce20c00e..ed1eeda6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1210,6 +1210,7 @@ static unsigned int evaluate_static_expression(struct hlsl_ir_node *node) } case HLSL_IR_EXPR: + case HLSL_IR_INDEX: case HLSL_IR_LOAD: case HLSL_IR_RESOURCE_LOAD: case HLSL_IR_SWIZZLE: diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f3fcbb71..ee980c34 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2200,6 +2200,7 @@ static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { case HLSL_IR_CONSTANT: case HLSL_IR_EXPR: + case HLSL_IR_INDEX: case HLSL_IR_LOAD: case HLSL_IR_RESOURCE_LOAD: case HLSL_IR_SWIZZLE: @@ -2440,6 +2441,14 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop swizzle->val.node->last_read = instr->index; break; } + case HLSL_IR_INDEX: + { + struct hlsl_ir_index *index = hlsl_ir_index(instr); + + index->val.node->last_read = instr->index; + index->idx.node->last_read = instr->index; + break; + } case HLSL_IR_CONSTANT: case HLSL_IR_JUMP: break;

1 0

Francisco Casas : vkd3d-shader/hlsl: Use hlsl_ir_index for array and record access.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 5c285adc6b677c731b34fe2b74336e40bed40716 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c285adc6b677c731b34fe2b74336… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Mar 10 22:09:58 2023 -0300 vkd3d-shader/hlsl: Use hlsl_ir_index for array and record access. >From this point on, it is no longer true that only hlsl_ir_loads can return objects, because an object can also come from chain of hlsl_ir_indexes that ends in an hlsl_ir_load. The lower_index_loads pass takes care of lowering all hlsl_ir_indexes into hlsl_ir_loads. For this reason, hlsl_resource_load_params now expects both the resource as the sampler to be just an hlsl_ir_node pointer instead of a pointer to a more specific hlsl_ir_load. --- libs/vkd3d-shader/hlsl.c | 88 +++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 5 +- libs/vkd3d-shader/hlsl.y | 128 ++++++++++----------------------- libs/vkd3d-shader/hlsl_codegen.c | 77 ++++++++++++++++++++ tests/hlsl-matrix-indexing.shader_test | 4 +- tests/side-effects.shader_test | 2 +- 6 files changed, 205 insertions(+), 99 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Remove add_load_index().
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 82ff408451b83f150bf15b844d21b419e0643c36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/82ff408451b83f150bf15b844d21b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 9 17:21:03 2023 -0300 vkd3d-shader/hlsl: Remove add_load_index(). --- libs/vkd3d-shader/hlsl.y | 59 +++++++++--------------------------------------- 1 file changed, 11 insertions(+), 48 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 437013ec..48a00540 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -620,38 +620,6 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs return jump; } -static struct hlsl_ir_load *add_load_index(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr, - struct hlsl_ir_node *idx, const struct vkd3d_shader_location *loc) -{ - const struct hlsl_deref *src; - struct hlsl_ir_load *load; - - if (var_instr->type == HLSL_IR_LOAD) - { - src = &hlsl_ir_load(var_instr)->src; - } - else - { - struct hlsl_ir_store *store; - struct hlsl_ir_var *var; - - if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) - return NULL; - - if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) - return NULL; - list_add_tail(instrs, &store->node.entry); - - src = &store->lhs; - } - - if (!(load = hlsl_new_load_index(ctx, src, idx, loc))) - return NULL; - list_add_tail(instrs, &load->node.entry); - - return load; -} - static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *var_instr, unsigned int comp, const struct vkd3d_shader_location *loc) { @@ -1321,46 +1289,41 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (type->class == HLSL_CLASS_MATRIX) { - struct hlsl_type *vector_type; + struct hlsl_type *scalar_type; struct hlsl_deref var_deref; struct hlsl_ir_load *load; struct hlsl_ir_var *var; - vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type)); + scalar_type = hlsl_get_scalar_type(ctx, type->base_type); if (!(var = hlsl_new_synthetic_var(ctx, "split_op", type, loc))) return NULL; hlsl_init_simple_deref_from_var(&var_deref, var); - for (i = 0; i < hlsl_type_major_size(type); ++i) + for (i = 0; i < type->dimy * type->dimx; ++i) { - struct hlsl_ir_node *value, *vector_operands[HLSL_MAX_OPERANDS] = { NULL }; + struct hlsl_ir_node *value, *cell_operands[HLSL_MAX_OPERANDS] = { NULL }; struct hlsl_ir_store *store; - struct hlsl_ir_constant *c; + struct hlsl_block block; unsigned int j; - if (!(c = hlsl_new_uint_constant(ctx, i, loc))) - return NULL; - list_add_tail(instrs, &c->node.entry); - for (j = 0; j < HLSL_MAX_OPERANDS; j++) { if (operands[j]) { - struct hlsl_ir_load *load; - - if (!(load = add_load_index(ctx, instrs, operands[j], &c->node, loc))) + if (!(load = add_load_component(ctx, instrs, operands[j], i, loc))) return NULL; - vector_operands[j] = &load->node; + + cell_operands[j] = &load->node; } } - if (!(value = add_expr(ctx, instrs, op, vector_operands, vector_type, loc))) + if (!(value = add_expr(ctx, instrs, op, cell_operands, scalar_type, loc))) return NULL; - if (!(store = hlsl_new_store_index(ctx, &var_deref, &c->node, value, 0, loc))) + if (!(store = hlsl_new_store_component(ctx, &block, &var_deref, i, value))) return NULL; - list_add_tail(instrs, &store->node.entry); + list_move_tail(instrs, &block.instrs); } if (!(load = hlsl_new_var_load(ctx, var, *loc)))

1 0

Francisco Casas : vkd3d-shader/hlsl: Always load from a synthetic copy in add_load_component().
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: dc2a34824d8cb00f3c348846c2a108adb94ed950 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dc2a34824d8cb00f3c348846c2a10… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 9 20:29:03 2023 -0300 vkd3d-shader/hlsl: Always load from a synthetic copy in add_load_component(). --- libs/vkd3d-shader/hlsl.y | 24 ++++++++---------------- tests/hlsl-function.shader_test | 4 ++-- tests/hlsl-intrinsic-override.shader_test | 2 +- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 48a00540..275587e2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -624,27 +624,19 @@ static struct hlsl_ir_load *add_load_component(struct hlsl_ctx *ctx, struct list unsigned int comp, const struct vkd3d_shader_location *loc) { const struct hlsl_deref *src; + struct hlsl_ir_store *store; struct hlsl_ir_load *load; struct hlsl_block block; + struct hlsl_ir_var *var; - if (var_instr->type == HLSL_IR_LOAD) - { - src = &hlsl_ir_load(var_instr)->src; - } - else - { - struct hlsl_ir_store *store; - struct hlsl_ir_var *var; - - if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) - return NULL; + if (!(var = hlsl_new_synthetic_var(ctx, "deref", var_instr->data_type, &var_instr->loc))) + return NULL; - if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) - return NULL; - list_add_tail(instrs, &store->node.entry); + if (!(store = hlsl_new_simple_store(ctx, var, var_instr))) + return NULL; + list_add_tail(instrs, &store->node.entry); - src = &store->lhs; - } + src = &store->lhs; if (!(load = hlsl_new_load_component(ctx, &block, src, comp, loc))) return NULL; diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index a7cad6d7..4d4c2e2b 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -276,7 +276,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (2.0, 3.0, 6.0, 7.0) +probe all rgba (2.0, 3.0, 6.0, 7.0) [pixel shader] @@ -294,4 +294,4 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (2.0, 3.0, 6.0, 7.0) +probe all rgba (2.0, 3.0, 6.0, 7.0) diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl-intrinsic-override.shader_test index 13e1752d..55a23f21 100644 --- a/tests/hlsl-intrinsic-override.shader_test +++ b/tests/hlsl-intrinsic-override.shader_test @@ -12,7 +12,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (0.3, 0.3, 0.4, 0.6) +probe all rgba (0.3, 0.3, 0.4, 0.6) [pixel shader]

1 0

Francisco Casas : vkd3d-shader/hlsl: Support column-major matrix indexing in the lhs.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: af1aa63ace696e918901afdb6ec0930600795104 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af1aa63ace696e918901afdb6ec09… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Mar 10 17:23:49 2023 -0300 vkd3d-shader/hlsl: Support column-major matrix indexing in the lhs. --- libs/vkd3d-shader/hlsl.y | 39 ++++++++++++++++++++++++++++++++-- tests/hlsl-matrix-indexing.shader_test | 6 +++--- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 275587e2..87ecfc1d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1769,8 +1769,43 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } else if (lhs->type == HLSL_IR_INDEX && hlsl_index_is_noncontiguous(hlsl_ir_index(lhs))) { - hlsl_fixme(ctx, &lhs->loc, "Column-major matrix index store."); - return NULL; + struct hlsl_ir_index *row = hlsl_ir_index(lhs); + struct hlsl_ir_node *mat = row->val.node; + unsigned int i, k = 0; + + for (i = 0; i < mat->data_type->dimx; ++i) + { + struct hlsl_ir_store *store; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *cell; + struct hlsl_ir_load *load; + struct hlsl_deref deref; + + if (!(writemask & (1 << i))) + continue; + + if (!(c = hlsl_new_uint_constant(ctx, i, &lhs->loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + if (!(cell = hlsl_new_index(ctx, &row->node, &c->node, &lhs->loc))) + return NULL; + list_add_tail(instrs, &cell->entry); + + if (!(load = add_load_component(ctx, instrs, rhs, k++, &rhs->loc))) + return NULL; + + if (!hlsl_init_deref_from_index_chain(ctx, &deref, cell)) + return NULL; + + if (!(store = hlsl_new_store_index(ctx, &deref, NULL, &load->node, 0, &rhs->loc))) + { + hlsl_cleanup_deref(&deref); + return NULL; + } + list_add_tail(instrs, &store->node.entry); + hlsl_cleanup_deref(&deref); + } } else { diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index e4731639..c3d08296 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -78,7 +78,7 @@ draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) -[pixel shader todo] +[pixel shader] float4 main() : SV_TARGET { float3x2 m = {1, 2, 3, 4, 5, 6}; @@ -89,8 +89,8 @@ float4 main() : SV_TARGET } [test] -todo draw quad -todo probe all rgba (30.0, 40.0, 5.0, 6.0) +draw quad +probe all rgba (30.0, 40.0, 5.0, 6.0) [pixel shader]

1 0

Zebediah Figura : vkd3d-shader/hlsl: Evaluate index before array.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: vkd3d Branch: master Commit: 8ed7437708d8a79daedac7103201152bea49766f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ed7437708d8a79daedac71032011… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 24 20:19:39 2023 -0300 vkd3d-shader/hlsl: Evaluate index before array. Co-authored-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 2 +- tests/side-effects.shader_test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 87ecfc1d..0ddae6ee 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5473,7 +5473,7 @@ postfix_expr: { struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); - list_move_tail($1, $3); + list_move_head($1, $3); vkd3d_free($3); if (!add_array_access(ctx, $1, array, index, &@2)) diff --git a/tests/side-effects.shader_test b/tests/side-effects.shader_test index f631db64..8e4557f0 100644 --- a/tests/side-effects.shader_test +++ b/tests/side-effects.shader_test @@ -44,4 +44,4 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (2.2, 2.2, 2.2, 2.2) +probe all rgba (2.2, 2.2, 2.2, 2.2)

1 0

Francois Gouget : user32/tests: Windows 11's notepad has four icons.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 9a3c0082836ae8bc552ed28c0ac3c12a46cda743 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a3c0082836ae8bc552ed28c0ac3c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 13 13:53:40 2023 +0200 user32/tests: Windows 11's notepad has four icons. There's the regular application icon and three different styles of close window icons. While there is nothing wrong with that this case is marked as broken() because Wine's notepad only has one icon so only 1 is a valid PrivateExtractIconsA() result in Wine. --- dlls/user32/tests/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index fff962b955c..472d65df186 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -348,7 +348,8 @@ static void test_PrivateExtractIcons(void) { ok(cIcons == ~0u, "got %u\n", cIcons); cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, NULL, NULL, 1, 0); - ok(cIcons == 1 || broken(cIcons == 2) /* win2k */, "got %u\n", cIcons); + ok(cIcons == 1 || broken(cIcons == 4) /* win11 */ || + broken(cIcons == 2) /* win2k */, "got %u\n", cIcons); ahIcon[0] = (HICON)0xdeadbeef; cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, NULL, 1, 0);

1 0

Francois Gouget : dnsapi/tests: Test how DnsQuery() handles CNAMEs.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 6e2efe54f17e72415b790edf6c9c1f9de5acb9f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e2efe54f17e72415b790edf6c9c1f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 13 05:51:20 2023 +0200 dnsapi/tests: Test how DnsQuery() handles CNAMEs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54819 --- dlls/dnsapi/tests/query.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 3307fcbe3cc..9b54aa3c816 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -36,8 +36,9 @@ static void test_DnsQuery(void) WCHAR domain[MAX_PATH]; WCHAR name[NS_MAXDNAME]; DWORD ret, size; - DNS_RECORDW *rec; + DNS_RECORDW *rec, *ptr; DNS_STATUS status; + WORD type; rec = NULL; status = DnsQuery_W(L"winehq.org", DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); @@ -49,6 +50,52 @@ static void test_DnsQuery(void) ok(status == ERROR_SUCCESS, "got %ld\n", status); DnsRecordListFree(rec, DnsFreeRecordList); + /* Show that DNS_TYPE_A returns CNAMEs too */ + rec = NULL; + wcscpy(domain, L"test.winehq.org"); /* should be a CNAME */ + status = DnsQuery_W(domain, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + if (status == ERROR_TIMEOUT) + { + skip("query timed out\n"); + return; + } + ok(status == ERROR_SUCCESS, "got %ld\n", status); + type = DNS_TYPE_CNAME; /* CNAMEs come first */ + for (ptr = rec; ptr; ptr = ptr->pNext) + { + ok(!wcscmp(domain, ptr->pName), "expected record name %s, got %s\n", wine_dbgstr_w(domain), wine_dbgstr_w(ptr->pName)); + ok(type == ptr->wType, "expected record type %d, got %d\n", type, ptr->wType); + if (ptr->wType == DNS_TYPE_CNAME) + { + /* CNAME chains are bad practice so assume A for the remainder */ + type = DNS_TYPE_A; + wcscpy(domain, L"winehq.org"); + ok(!wcscmp(domain, ptr->Data.CNAME.pNameHost), "expected CNAME target %s, got %s\n", wine_dbgstr_w(domain), wine_dbgstr_w(ptr->Data.CNAME.pNameHost)); + } + } + DnsRecordListFree(rec, DnsFreeRecordList); + + /* But DNS_TYPE_CNAME does not return A records! */ + rec = NULL; + wcscpy(domain, L"test.winehq.org"); + status = DnsQuery_W(L"test.winehq.org", DNS_TYPE_CNAME, DNS_QUERY_STANDARD, NULL, &rec, NULL); + if (status == ERROR_TIMEOUT) + { + skip("query timed out\n"); + return; + } + ok(status == ERROR_SUCCESS, "got %ld\n", status); + ptr = rec; + ok(!wcscmp(domain, ptr->pName), "expected record name %s, got %s\n", wine_dbgstr_w(domain), wine_dbgstr_w(ptr->pName)); + ok(DNS_TYPE_CNAME == ptr->wType, "expected record type %d, got %d\n", DNS_TYPE_CNAME, ptr->wType); + if (ptr->wType == DNS_TYPE_CNAME) + { + wcscpy(domain, L"winehq.org"); + ok(!wcscmp(domain, ptr->Data.CNAME.pNameHost), "expected CNAME target %s, got %s\n", wine_dbgstr_w(domain), wine_dbgstr_w(ptr->Data.CNAME.pNameHost)); + } + ok(ptr->pNext == NULL, "unexpected CNAME chain\n"); + DnsRecordListFree(rec, DnsFreeRecordList); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %ld\n", status);

1 0

Francois Gouget : advapi32/tests: Make the services resume handle traces more informative.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 4abd7af2e469ed797929c14b29f14b6f0b8d2e94 URL: https://gitlab.winehq.org/wine/wine/-/commit/4abd7af2e469ed797929c14b29f14b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 13 16:00:03 2023 +0200 advapi32/tests: Make the services resume handle traces more informative. --- dlls/advapi32/tests/service.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index da8495da45f..8cc737207e0 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1350,9 +1350,9 @@ static BOOL test_enum_svc(int attempt) goto retry; /* service stop race condition */ } ok(!ret, "Expected failure\n"); - ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services\n"); - todo_wine ok(needed < tempneeded, "Expected a smaller needed buffer size for the missing services\n"); - ok(returned < tempreturned, "Expected fewer services to be returned\n"); + ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services, got %lx\n", needed); + todo_wine ok(needed < tempneeded, "Expected < %lu bytes needed for the remaining services, got %lu\n", tempneeded, needed); + ok(returned < tempreturned, "Expected < %lu remaining services, got %lu\n", tempreturned, returned); todo_wine ok(resume, "Expected a resume handle\n"); ok(GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %ld\n", GetLastError()); @@ -1369,8 +1369,8 @@ static BOOL test_enum_svc(int attempt) if (!ret && GetLastError() == ERROR_MORE_DATA && attempt) goto retry; /* service start race condition */ ok(ret, "Expected success, got error %lu\n", GetLastError()); - ok(needed == 0, "Expected needed buffer to be 0 as we are done\n"); - todo_wine ok(returned == missing, "Expected %lu services to be returned\n", missing); + ok(needed == 0, "Expected 0 needed bytes as we are done, got %lu\n", needed); + todo_wine ok(returned == missing, "Expected %lu remaining services, got %lu\n", missing, returned); ok(resume == 0, "Expected the resume handle to be 0\n"); /* See if things add up */

1 0