March 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Rename hlsl_type_compare() to hlsl_types_are_equal().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 3ac20487f897982e5143dcda30025cda30a422be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3ac20487f897982e5143dcd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 18 00:22:19 2021 -0500 vkd3d-shader: Rename hlsl_type_compare() to hlsl_types_are_equal(). hlsl_type_compare() implies a stable comparison function, as if to be passed to qsort(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 14 +++++++------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 988f64d..cb13e8f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -230,7 +230,7 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) return count; } -bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) { if (t1 == t2) return true; @@ -259,7 +259,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) { t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); - if (!hlsl_type_compare(t1field->type, t2field->type)) + if (!hlsl_types_are_equal(t1field->type, t2field->type)) return false; if (strcmp(t1field->name, t2field->name)) return false; @@ -271,7 +271,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) } if (t1->type == HLSL_CLASS_ARRAY) return t1->e.array.elements_count == t2->e.array.elements_count - && hlsl_type_compare(t1->e.array.type, t2->e.array.type); + && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); return true; } @@ -473,7 +473,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i { struct hlsl_ir_expr *expr; - assert(hlsl_type_compare(arg1->data_type, arg2->data_type)); + assert(hlsl_types_are_equal(arg1->data_type, arg2->data_type)); if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) return NULL; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 92ac527..c15a8d9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -563,10 +563,10 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLS struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; -bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4769475..af6c397 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -169,7 +169,7 @@ static bool compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) if (t1->type == HLSL_CLASS_ARRAY) { - if (hlsl_type_compare(t1->e.array.type, t2)) + if (hlsl_types_are_equal(t1->e.array.type, t2)) /* e.g. float4[3] to float4 is allowed */ return true; @@ -226,7 +226,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) { /* e.g. float4[3] to float4 is allowed */ - if (t1->type == HLSL_CLASS_ARRAY && hlsl_type_compare(t1->e.array.type, t2)) + if (t1->type == HLSL_CLASS_ARRAY && hlsl_types_are_equal(t1->e.array.type, t2)) return true; if (hlsl_type_component_count(t1) == hlsl_type_component_count(t2)) return true; @@ -254,7 +254,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ } if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) - return hlsl_type_compare(t1, t2); + return hlsl_types_are_equal(t1, t2); return false; } @@ -265,7 +265,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct struct hlsl_type *src_type = node->data_type; struct hlsl_ir_expr *cast; - if (hlsl_type_compare(src_type, dst_type)) + if (hlsl_types_are_equal(src_type, dst_type)) return node; if (!implicit_compatible_data_types(src_type, dst_type)) @@ -1046,7 +1046,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return NULL; } - if (hlsl_type_compare(t1, t2)) + if (hlsl_types_are_equal(t1, t2)) return t1; if (!expr_compatible_data_types(t1, t2)) @@ -1158,7 +1158,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (!operands[i]) break; - if (hlsl_type_compare(operands[i]->data_type, type)) + if (hlsl_types_are_equal(operands[i]->data_type, type)) continue; if (operands[i]->data_type->dimx * operands[i]->data_type->dimy != 1 && operands[i]->data_type->dimx * operands[i]->data_type->dimy != type->dimx * type->dimy) @@ -1799,7 +1799,7 @@ hlsl_prog: hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously defined here.", $2.name); YYABORT; } - else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) + else if (!hlsl_types_are_equal(decl->return_type, $2.decl->return_type)) { hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" was already declared with a different return type.", $2.name); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 283a67e..5b68a46 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -73,7 +73,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (expr->op != HLSL_IR_UNOP_CAST) return false; - if (hlsl_type_compare(src_type, dst_type) + if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { replace_node(&expr->node, expr->operands[0].node);

1 0

Zebediah Figura : vkd3d-shader: Split struct copies.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 716753896e37fbe94c74abe2dc643e07ef495f58 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=716753896e37fbe94c74abe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 18 00:22:21 2021 -0500 vkd3d-shader: Split struct copies. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5b68a46..2382ffe 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -84,6 +84,86 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst return false; } +static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + const struct hlsl_struct_field *field; + const struct hlsl_ir_load *rhs_load; + struct hlsl_ir_assignment *assign; + const struct hlsl_ir_node *rhs; + const struct hlsl_type *type; + + if (instr->type != HLSL_IR_ASSIGNMENT) + return false; + + assign = hlsl_ir_assignment(instr); + rhs = assign->rhs.node; + type = rhs->data_type; + if (type->type != HLSL_CLASS_STRUCT) + return false; + + rhs_load = hlsl_ir_load(rhs); + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + struct hlsl_ir_node *offset, *add; + struct hlsl_ir_assignment *store; + struct hlsl_ir_load *field_load; + struct hlsl_ir_constant *c; + + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, instr->loc))) + { + ctx->failed = true; + return false; + } + list_add_before(&instr->entry, &c->node.entry); + + offset = &c->node; + if (rhs_load->src.offset.node) + { + if (!(add = hlsl_new_binary_expr(HLSL_IR_BINOP_ADD, rhs_load->src.offset.node, &c->node))) + { + ctx->failed = true; + return false; + } + list_add_before(&instr->entry, &add->entry); + offset = add; + } + if (!(field_load = hlsl_new_load(rhs_load->src.var, offset, field->type, instr->loc))) + { + ctx->failed = true; + return false; + } + list_add_before(&instr->entry, &field_load->node.entry); + + offset = &c->node; + if (assign->lhs.offset.node) + { + if (!(add = hlsl_new_binary_expr(HLSL_IR_BINOP_ADD, assign->lhs.offset.node, &c->node))) + { + ctx->failed = true; + return false; + } + list_add_before(&instr->entry, &add->entry); + offset = add; + } + + if (!(store = hlsl_new_assignment(assign->lhs.var, offset, &field_load->node, 0, instr->loc))) + { + ctx->failed = true; + return false; + } + list_add_before(&instr->entry, &store->node.entry); + } + + /* Remove the assignment instruction, so that we can split structs + * which contain other structs. Although assignment instructions + * produce a value, we don't allow HLSL_IR_ASSIGNMENT to be used as + * a source. */ + list_remove(&assign->node.entry); + hlsl_free_instr(&assign->node); + return true; +} + static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -317,6 +397,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun list_move_head(entry_func->body, &ctx->static_initializers); while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); + while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); while (transform_ir(ctx, dce, entry_func->body, NULL));

1 0

Zebediah Figura : vkd3d-shader: Eliminate unused assignments.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 3377f2445a20d15eee95cf748c9fa52ab13a13a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3377f2445a20d15eee95cf7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 18 00:22:22 2021 -0500 vkd3d-shader: Eliminate unused assignments. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 59514e4..b9f753a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -244,6 +244,19 @@ static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) break; case HLSL_IR_ASSIGNMENT: + { + struct hlsl_ir_assignment *assignment = hlsl_ir_assignment(instr); + struct hlsl_ir_var *var = assignment->lhs.var; + + if (var->last_read < instr->index) + { + list_remove(&instr->entry); + hlsl_free_instr(instr); + return true; + } + break; + } + case HLSL_IR_IF: case HLSL_IR_JUMP: case HLSL_IR_LOOP: @@ -371,8 +384,18 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { + struct hlsl_scope *scope; struct hlsl_ir_var *var; + /* Index 0 means unused; index 1 means function entry, so start at 2. */ + index_instructions(entry_func->body, 2); + + LIST_FOR_EACH_ENTRY(scope, &ctx->scopes, struct hlsl_scope, entry) + { + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + var->first_write = var->last_read = 0; + } + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { var->first_write = 1; @@ -399,16 +422,16 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun while (transform_ir(ctx, fold_redundant_casts, entry_func->body, NULL)); while (transform_ir(ctx, split_struct_copies, entry_func->body, NULL)); while (transform_ir(ctx, fold_constants, entry_func->body, NULL)); + + do + compute_liveness(ctx, entry_func); while (transform_ir(ctx, dce, entry_func->body, NULL)); - /* Index 0 means unused; index 1 means function entry, so start at 2. */ - index_instructions(entry_func->body, 2); + compute_liveness(ctx, entry_func); if (TRACE_ON()) rb_for_each_entry(&ctx->functions, dump_function, NULL); - compute_liveness(ctx, entry_func); - if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_NOT_IMPLEMENTED;

1 0

Henri Verbeet : vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_output().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 3b4b898cc5501d081510ec241088ccb41ddb21d8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b4b898cc5501d081510ec2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:03 2021 +0100 vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_output(). When outputs are coalesced, the write mask is modified by needs_private_io_variable(). We want the "dcl_mask" field to reflect that as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4598ffa..d9bfa09 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4702,20 +4702,14 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; - if ((use_private_variable = builtin && builtin->spirv_array_size)) - write_mask = VKD3DSP_WRITEMASK_ALL; - else if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + if (!(use_private_variable = builtin && builtin->spirv_array_size) + && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE || needs_private_io_variable(shader_signature, signature_element->register_index, builtin, &output_component_count, &write_mask) - || is_patch_constant) - { + || is_patch_constant)) use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - } else - { component_idx = vkd3d_write_mask_get_component_idx(write_mask); - } vkd3d_symbol_make_register(&reg_symbol, reg); @@ -4725,16 +4719,13 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler id = symbol->id; } - if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) + if (!symbol || ~symbol->info.reg.dcl_mask & write_mask) { if (compiler->output_info[signature_idx].id) { id = compiler->output_info[signature_idx].id; if (compiler->output_info[signature_idx].array_element_mask) - { use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - } } else if (builtin) { @@ -4795,7 +4786,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); + use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, + use_private_variable ? VKD3DSP_WRITEMASK_ALL : write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size; if (!use_private_variable && is_control_point_phase(phase)) { @@ -4806,7 +4798,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { reg_symbol.info.reg.member_idx = reg->idx[0].offset; } - reg_symbol.info.reg.dcl_mask = signature_element->mask; + reg_symbol.info.reg.dcl_mask = write_mask; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -4815,7 +4807,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - symbol->info.reg.dcl_mask |= signature_element->mask; + symbol->info.reg.dcl_mask |= write_mask; var_id = symbol->id; }

1 0

Henri Verbeet : vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_input().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: cad26f7f2cdb03813c815b4556512bc68db82c53 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cad26f7f2cdb03813c815b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:04 2021 +0100 vkd3d-shader: Use the (potentially) modified write mask as dcl_mask in vkd3d_dxbc_compiler_emit_input(). Like outputs, when inputs are coalesced, the write mask is modified by needs_private_io_variable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d9bfa09..a639f7e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4187,11 +4187,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval, enum vkd3d_shader_interpolation_mode interpolation_mode) { - unsigned int component_idx, component_count, input_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_signature_element *signature_element; const struct vkd3d_shader_signature *shader_signature; const struct vkd3d_shader_register *reg = &dst->reg; + unsigned int component_idx, input_component_count; enum vkd3d_shader_component_type component_type; uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; @@ -4238,7 +4238,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi write_mask = signature_element->mask; - component_count = vkd3d_write_mask_component_count(dst->write_mask); if (builtin) { component_type = builtin->component_type; @@ -4252,21 +4251,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } - if ((use_private_var = builtin && builtin->fixup_pfn)) - { - component_count = VKD3D_VEC4_SIZE; - write_mask = VKD3DSP_WRITEMASK_ALL; - } - else if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) - { + if (!(use_private_var = builtin && builtin->fixup_pfn) + && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) use_private_var = true; - component_count = VKD3D_VEC4_SIZE; - write_mask = VKD3DSP_WRITEMASK_ALL; - } else - { component_idx = vkd3d_write_mask_get_component_idx(write_mask); - } storage_class = SpvStorageClassInput; @@ -4293,7 +4282,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } } - if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) + if (!symbol || ~symbol->info.reg.dcl_mask & write_mask) { if (builtin) { @@ -4326,19 +4315,20 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { storage_class = SpvStorageClassPrivate; var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, component_count, array_size); + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, array_size); } vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_var ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); - reg_symbol.info.reg.dcl_mask |= signature_element->mask; + use_private_var ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, + use_private_var ? VKD3DSP_WRITEMASK_ALL : write_mask); + reg_symbol.info.reg.dcl_mask |= write_mask; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } else { - symbol->info.reg.dcl_mask |= signature_element->mask; + symbol->info.reg.dcl_mask |= write_mask; } if (use_private_var)

1 0

Matteo Bruni : vkd3d-shader: Consider previous last_read value when computing liveness.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: f73b3385c76fc68c2060698c92829bb1edb7b40b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f73b3385c76fc68c2060698… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Mar 21 21:40:07 2021 +0100 vkd3d-shader: Consider previous last_read value when computing liveness. Otherwise we end up overwriting UINT_MAX last_read for output variables. Signed-off-by: Matteo Bruni <mbruni(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_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2382ffe..59514e4 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -342,7 +342,7 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs struct hlsl_ir_load *load = hlsl_ir_load(instr); var = load->src.var; - var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; + var->last_read = max(var->last_read, loop_last ? max(instr->index, loop_last) : instr->index); if (load->src.offset.node) load->src.offset.node->last_read = instr->index; break;

1 0

Francois Gouget : testbot/LogUtils: Don't include garbage in the .errors file.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: tools Branch: master Commit: 4ddd1988c59548839c1c19e146ea213ecd0e74d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4ddd1988c59548839c1c19e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 22 11:12:15 2021 +0100 testbot/LogUtils: Don't include garbage in the .errors file. When failure lines are garbled because of a race condition or a missing '\n' they often contain unwanted characters at the start of the line. If included in the .errors file these prevent the line from matching past instances of the failure (if only because of line numbers), thus causing it to be incorrectly reported as new. So only include the parts of the line matched by the error matching regular expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50491 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 ++++---- testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7670f59..5f7046c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -573,7 +573,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -625,7 +625,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } } @@ -636,7 +636,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } } @@ -654,7 +654,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, $&); $Cur->{LineFailures}++; } } diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index e198827..104c8ea 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -50,11 +50,11 @@ n 0 comboex.c:40: Test failed: A failure in the main process n 0 comboex.c:41: Test succeeded inside todo block: Success in the main process n 0 header.c:1: Test failed: Something wrong n 0 1234:rebar: unhandled exception c0000005 at 0040167C -n 0 garbled0123:status: unhandled exception c0000005 at 0040167C -n 0 status.c:33: unhandled exception c0000005 in child process 0123dead +n 0 0123:status: unhandled exception c0000005 at 0040167C +n 0 status.c:33: unhandled exception c0000005 in child process 0123 n 0 1234:subclass: unhandled exception c0000005 at 0040167C -n 0 Do not cut syslink.c:40: Test failed: Something wrong -n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 syslink.c:40: Test failed: Something wrong +n 0 syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234

1 0

Francois Gouget : testbot/LogUtils: Don't expect CVS revisions on the test report start lines.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: tools Branch: master Commit: e03d3be14e58852231f5bead99f9ba2b7794aec4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e03d3be14e58852231f5bea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 21 19:15:53 2021 +0100 testbot/LogUtils: Don't expect CVS revisions on the test report start lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 840a552..7670f59 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -543,7 +543,7 @@ sub ParseWineTestReport($$$) chomp $Line; $Line =~ s/\r+$//; - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+)%) { my ($Dll, $Unit, $Type) = ($1, $2, $3);

1 0

Jacek Caban : include: Add missing typedefs to windows.foundation.idl.
by Alexandre Julliard March 19, 2021

March 19, 2021

Module: wine Branch: master Commit: 41df83c50e1c3cfdd6e8ffb65de7838f8503632c URL: https://source.winehq.org/git/wine.git/?a=commit;h=41df83c50e1c3cfdd6e8ffb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 19 19:54:58 2021 +0100 include: Add missing typedefs to windows.foundation.idl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index b06b9eadaf4..c4dc454974f 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -29,6 +29,13 @@ import "windows.foundation.collections.idl"; namespace Windows { namespace Foundation { + typedef enum PropertyType PropertyType; + typedef struct Point Point; + typedef struct Size Size; + typedef struct Rect Rect; + typedef struct DateTime DateTime; + typedef struct TimeSpan TimeSpan; + [contract(Windows.Foundation.FoundationContract, 1.0)] enum PropertyType { Empty = 0,

1 0

Alexandre Julliard : server: Don't change the reported machine for COM+ images.
by Alexandre Julliard March 19, 2021

March 19, 2021

Module: wine Branch: master Commit: cc9446f87486865f91a71d0a456711633bcb1397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9446f87486865f91a71d0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 22:01:42 2021 +0100 server: Don't change the reported machine for COM+ images. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50826 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 12 +++++++++--- dlls/ntdll/unix/process.c | 15 +++++++++------ server/mapping.c | 4 ---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 87a81343737..9e43358a26d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -452,14 +452,20 @@ static NTSTATUS loader_exec( const char *loader, char **argv, WORD machine ) */ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_info ) { - int is_child_64bit = (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || - pe_info->machine == IMAGE_FILE_MACHINE_ARM64); + WORD machine = pe_info->machine; + int is_child_64bit = (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; const char *loader = argv0; const char *loader_env = getenv( "WINELOADER" ); char preloader_reserve[64], socket_env[64]; + if (!is_child_64bit && (is_win64 || is_wow64) && (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + { + is_child_64bit = TRUE; + machine = IMAGE_FILE_MACHINE_AMD64; + } + if (!is_win64 ^ !is_child_64bit) { /* remap WINELOADER to the alternate 32/64-bit version if necessary */ @@ -495,7 +501,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i putenv( preloader_reserve ); putenv( socket_env ); - return loader_exec( loader, argv, pe_info->machine ); + return loader_exec( loader, argv, machine ); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index d6dc893fba5..f1804009782 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -80,11 +80,14 @@ static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "AR static UINT process_error_mode; -static client_cpu_t get_machine_cpu( WORD machine ) +static client_cpu_t get_machine_cpu( pe_image_info_t *pe_info ) { - switch (machine) + switch (pe_info->machine) { - case IMAGE_FILE_MACHINE_I386: return CPU_x86; + case IMAGE_FILE_MACHINE_I386: + if ((is_win64 || is_wow64) && (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady)) + return CPU_x86_64; + return CPU_x86; case IMAGE_FILE_MACHINE_AMD64: return CPU_x86_64; case IMAGE_FILE_MACHINE_ARMNT: return CPU_ARM; case IMAGE_FILE_MACHINE_ARM64: return CPU_ARM64; @@ -679,7 +682,7 @@ void DECLSPEC_NORETURN exec_process( NTSTATUS status ) SERVER_START_REQ( exec_process ) { req->socket_fd = socketfd[1]; - req->cpu = get_machine_cpu( pe_info.machine ); + req->cpu = get_machine_cpu( &pe_info ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -963,7 +966,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ req->create_flags = params->DebugFlags; /* hack: creation flags stored in DebugFlags for now */ req->socket_fd = socketfd[1]; req->access = process_access; - req->cpu = get_machine_cpu( pe_info.machine ); + req->cpu = get_machine_cpu( &pe_info ); req->info_size = startup_info_size; req->handles_size = handles_size; wine_server_add_data( req, objattr, attr_len ); @@ -990,7 +993,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ break; case STATUS_INVALID_IMAGE_FORMAT: ERR( "%s not supported on this installation (%s binary)\n", - debugstr_us(&path), cpu_names[get_machine_cpu(pe_info.machine)] ); + debugstr_us(&path), cpu_names[get_machine_cpu(&pe_info)] ); break; } goto done; diff --git a/server/mapping.c b/server/mapping.c index 3a162eae76b..13a0948a8ab 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -788,11 +788,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { if (!(clr.Flags & COMIMAGE_FLAGS_32BITREQUIRED)) - { mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady; - if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.machine = IMAGE_FILE_MACHINE_AMD64; - else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.machine = IMAGE_FILE_MACHINE_ARM64; - } if (clr.Flags & COMIMAGE_FLAGS_32BITPREFERRED) mapping->image.image_flags |= IMAGE_FLAGS_ComPlusPrefer32bit; }

1 0