- Wine-Devel - list.winehq.org

[PATCH vkd3d 12/12] vkd3d-shader/hlsl: Replace register offsets with index paths in split copies.
by Francisco Casas July 8, 2022

July 8, 2022

hlsl_new_store() and hlsl_new_load() are deleted, so now there are no more direct ways to create derefs with offsets in hlsl.c and hlsl.h. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 32 ------------------------- libs/vkd3d-shader/hlsl.h | 4 ---- libs/vkd3d-shader/hlsl_codegen.c | 40 +++++++++----------------------- 3 files changed, 11 insertions(+), 65 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3454e5ee..fdf023f1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -744,25 +744,6 @@ static struct hlsl_type *get_type_from_deref(struct hlsl_ctx *ctx, const struct return type; } -struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) -{ - struct hlsl_ir_store *store; - - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; - - if (!(store = hlsl_alloc(ctx, sizeof(*store)))) - return NULL; - - init_node(&store->node, HLSL_IR_STORE, NULL, loc); - init_deref(ctx, &store->lhs, var, 0); - hlsl_src_from_node(&store->lhs.offset, offset); - hlsl_src_from_node(&store->rhs, rhs); - store->writemask = writemask; - return store; -} - /* Returns a simple variable derefence, so that the value can be stored and then passed by reference * to load/store functions. It shall not be modified afterwards. */ struct hlsl_deref hlsl_get_direct_var_deref(struct hlsl_ir_var *var) @@ -948,19 +929,6 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit return iff; } -struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_type *type, const struct vkd3d_shader_location loc) -{ - struct hlsl_ir_load *load; - - if (!(load = hlsl_alloc(ctx, sizeof(*load)))) - return NULL; - init_node(&load->node, HLSL_IR_LOAD, type, loc); - init_deref(ctx, &load->src, var, 0); - hlsl_src_from_node(&load->src.offset, offset); - return load; -} - struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, struct hlsl_ir_node *idx, struct vkd3d_shader_location loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index dd5ea1d7..efb186cf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -774,11 +774,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struc enum hlsl_resource_load_type type, struct hlsl_deref *resource, struct hlsl_deref *sampler, struct hlsl_ir_node *coords, struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc); -struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_type *type, struct vkd3d_shader_location loc); struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc); -struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc); struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct hlsl_struct_field *fields, size_t field_count); struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0276fb89..2c7b5f20 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -946,39 +946,21 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst * split_matrix_copies(). Inserts new instructions right before * "store". */ static bool split_copy(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, - const struct hlsl_ir_load *load, const unsigned int offset, struct hlsl_type *type) + const struct hlsl_ir_load *load, const unsigned int indx, struct hlsl_type *type) { - struct hlsl_ir_node *offset_instr, *add; struct hlsl_ir_store *split_store; struct hlsl_ir_load *split_load; struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, offset, &store->node.loc))) + if (!(c = hlsl_new_uint_constant(ctx, indx, &store->node.loc))) return false; list_add_before(&store->node.entry, &c->node.entry); - offset_instr = &c->node; - if (load->src.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, load->src.offset.node, &c->node))) - return false; - list_add_before(&store->node.entry, &add->entry); - offset_instr = add; - } - if (!(split_load = hlsl_new_load(ctx, load->src.var, offset_instr, type, store->node.loc))) + if (!(split_load = hlsl_new_load_index(ctx, &load->src, &c->node, store->node.loc))) return false; list_add_before(&store->node.entry, &split_load->node.entry); - offset_instr = &c->node; - if (store->lhs.offset.node) - { - if (!(add = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, store->lhs.offset.node, &c->node))) - return false; - list_add_before(&store->node.entry, &add->entry); - offset_instr = add; - } - - if (!(split_store = hlsl_new_store(ctx, store->lhs.var, offset_instr, &split_load->node, 0, store->node.loc))) + if (!(split_store = hlsl_new_store_index(ctx, &store->lhs, &c->node, &split_load->node, 0, store->node.loc))) return false; list_add_before(&store->node.entry, &split_store->node.entry); @@ -990,8 +972,8 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, const struct hlsl_ir_node *rhs; struct hlsl_type *element_type; const struct hlsl_type *type; - unsigned int element_size, i; struct hlsl_ir_store *store; + unsigned int i; if (instr->type != HLSL_IR_STORE) return false; @@ -1002,7 +984,6 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, if (type->type != HLSL_CLASS_ARRAY) return false; element_type = type->e.array.type; - element_size = hlsl_type_get_array_element_reg_size(element_type); if (rhs->type != HLSL_IR_LOAD) { @@ -1012,7 +993,7 @@ static bool split_array_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, for (i = 0; i < type->e.array.elements_count; ++i) { - if (!split_copy(ctx, store, hlsl_ir_load(rhs), i * element_size, element_type)) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, element_type)) return false; } @@ -1050,7 +1031,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr { const struct hlsl_struct_field *field = &type->e.record.fields[i]; - if (!split_copy(ctx, store, hlsl_ir_load(rhs), field->reg_offset, field->type)) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, field->type)) return false; } @@ -1088,7 +1069,7 @@ static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr for (i = 0; i < hlsl_type_major_size(type); ++i) { - if (!split_copy(ctx, store, hlsl_ir_load(rhs), 4 * i, element_type)) + if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, element_type)) return false; } @@ -2102,8 +2083,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry append_output_var_copy(ctx, &body->instrs, entry_func->return_var); } - transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); /* TODO: move forward, remove when no longer needed */ - transform_ir(ctx, lower_broadcasts, body, NULL); while (transform_ir(ctx, fold_redundant_casts, body, NULL)); do @@ -2113,6 +2092,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, split_matrix_copies, body, NULL); + + transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); /* TODO: move forward, remove when no longer needed */ + transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); do -- 2.34.1

2 1

[PATCH vkd3d 10/12] vkd3d-shader/hlsl: Add input and output variables using the same function.
by Francisco Casas July 8, 2022

July 8, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 81 +++++++++++++++----------------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 67229195..07c11f3f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -204,11 +204,44 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru list_add_after(&load->node.entry, &store->node.entry); } +static struct hlsl_ir_var *add_extern_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, + struct hlsl_type *type, unsigned int modifiers, const struct hlsl_semantic *semantic, bool output) +{ + struct hlsl_semantic new_semantic; + struct vkd3d_string_buffer *name; + struct hlsl_ir_var *ext_var; + + if (!(name = hlsl_get_string_buffer(ctx))) + return NULL; + vkd3d_string_buffer_printf(name, "<%s-%s%u>", output? "output" : "input", semantic->name, semantic->index); + if (!(new_semantic.name = hlsl_strdup(ctx, semantic->name))) + { + hlsl_release_string_buffer(ctx, name); + return NULL; + } + new_semantic.index = semantic->index; + if (!(ext_var = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), + type, var->loc, &new_semantic, modifiers, NULL))) + { + hlsl_release_string_buffer(ctx, name); + vkd3d_free((void *)new_semantic.name); + return NULL; + } + hlsl_release_string_buffer(ctx, name); + if (output) + ext_var->is_output_semantic = 1; + else + ext_var->is_input_semantic = 1; + ext_var->is_param = var->is_param; + list_add_before(&var->scope_entry, &ext_var->scope_entry); + list_add_tail(&ctx->extern_vars, &ext_var->extern_entry); + + return ext_var; +} + static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var, struct hlsl_type *type, unsigned int field_offset, unsigned int modifiers, const struct hlsl_semantic *semantic) { - struct vkd3d_string_buffer *name; - struct hlsl_semantic new_semantic; struct hlsl_ir_constant *offset; struct hlsl_ir_store *store; struct hlsl_ir_load *load; @@ -229,27 +262,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } - if (!(name = hlsl_get_string_buffer(ctx))) + if (!(input = add_extern_var(ctx, var, type, modifiers, semantic, false))) return; - vkd3d_string_buffer_printf(name, "<input-%s%u>", semantic->name, semantic->index); - if (!(new_semantic.name = hlsl_strdup(ctx, semantic->name))) - { - hlsl_release_string_buffer(ctx, name); - return; - } - new_semantic.index = semantic->index; - if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), - type, var->loc, &new_semantic, modifiers, NULL))) - { - hlsl_release_string_buffer(ctx, name); - vkd3d_free((void *)new_semantic.name); - return; - } - hlsl_release_string_buffer(ctx, name); - input->is_input_semantic = 1; - input->is_param = var->is_param; - list_add_before(&var->scope_entry, &input->scope_entry); - list_add_tail(&ctx->extern_vars, &input->extern_entry); if (!(load = hlsl_new_var_load(ctx, input, var->loc))) return; @@ -297,8 +311,6 @@ static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, st static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var, struct hlsl_type *type, unsigned int field_offset, unsigned int modifiers, const struct hlsl_semantic *semantic) { - struct vkd3d_string_buffer *name; - struct hlsl_semantic new_semantic; struct hlsl_ir_constant *offset; struct hlsl_ir_store *store; struct hlsl_ir_var *output; @@ -319,27 +331,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } - if (!(name = hlsl_get_string_buffer(ctx))) + if (!(output = add_extern_var(ctx, var, type, modifiers, semantic, true))) return; - vkd3d_string_buffer_printf(name, "<output-%s%u>", semantic->name, semantic->index); - if (!(new_semantic.name = hlsl_strdup(ctx, semantic->name))) - { - hlsl_release_string_buffer(ctx, name); - return; - } - new_semantic.index = semantic->index; - if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), - type, var->loc, &new_semantic, modifiers, NULL))) - { - vkd3d_free((void *)new_semantic.name); - hlsl_release_string_buffer(ctx, name); - return; - } - hlsl_release_string_buffer(ctx, name); - output->is_output_semantic = 1; - output->is_param = var->is_param; - list_add_before(&var->scope_entry, &output->scope_entry); - list_add_tail(&ctx->extern_vars, &output->extern_entry); if (!(offset = hlsl_new_uint_constant(ctx, field_offset, &var->loc))) return; -- 2.34.1

2 1

Re: [PATCH 1/1] crypt32: Recognize 'Microsoft Root Certificate Authority 2011' when verifying the Microsoft root policy.
by Marvin July 8, 2022

July 8, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=118594 Your paranoid android. === debian11 (32 bit report) === crypt32: chain.c:5006: Test failed: msRootPolicyCheck[3](#0007): expected 800b0109, got 00000000 === debian11 (32 bit Chinese:China report) === crypt32: chain.c:5006: Test failed: msRootPolicyCheck[3](#0007): expected 800b0109, got 00000000 === debian11 (32 bit WoW report) === crypt32: chain.c:5006: Test failed: msRootPolicyCheck[3](#0007): expected 800b0109, got 00000000 === debian11 (64 bit WoW report) === crypt32: chain.c:5006: Test failed: msRootPolicyCheck[3](#0007): expected 800b0109, got 00000000

1 0

[tools] testbot/web: Clearly identify unused variables in the reset password page.
by Francois Gouget July 8, 2022

July 8, 2022

This also avoids shadowing the $User variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/ResetPassword.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 65dcdd539d..b6c0ae9cb5 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -118,8 +118,8 @@ sub OnChangePassword($) return !1; } - ($ErrMessage, my $User) = $Users->Authenticate($self->GetParam("Name"), - $self->GetParam("Password1")); + ($ErrMessage, my $_User) = $Users->Authenticate($self->GetParam("Name"), + $self->GetParam("Password1")); if (defined $ErrMessage) { $self->AddError($ErrMessage, "Name"); @@ -127,8 +127,7 @@ sub OnChangePassword($) } my $Sessions = CreateSessions(); - ($ErrMessage, my $Session) = $Sessions->NewSession($User, - defined($self->GetParam("AutoLogin"))); + ($ErrMessage, my $_Session) = $Sessions->NewSession($User, defined $self->GetParam("AutoLogin")); if ($ErrMessage) { $self->AddError($ErrMessage, "Name"); -- 2.30.2

1 0

[tools] testbot/web: Add links to the first and last new untracked failures.
by Francois Gouget July 8, 2022

July 8, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3fbdb427e6..321d025e72 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -437,8 +437,13 @@ sub GenerateFullLog($$$$$) } } } - $LogBugs{-1} ||= [$LineNo, ""]; - $LogBugs{9999999} = [$LineNo, ""]; + $LogBugs{-2} ||= [$LineNo, "First failure"]; + if ($ErrCategory{$LineNo} eq "fullnew" and !$ErrFailures{$LineNo}) + { + $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; + $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; + } + $LogBugs{10000001} = [$LineNo, "Last failure"]; } } if (%LogBugs) @@ -447,7 +452,11 @@ sub GenerateFullLog($$$$$) foreach my $Label (sort { $a <=> $b } keys %LogBugs) { my ($LineNo, $Title) = @{$LogBugs{$Label}}; - $Label = $Label < 0 ? "First" : $Label == 9999999 ? "Last" : $Label; + $Label = $Label == -2 ? "First" : + $Label == -1 ? "new" : + $Label == 10000000 ? "new" : + $Label == 10000001 ? "Last" : + $Label; $Title = " title='". $self->escapeHTML($Title) ."'" if ($Title); print " <a href='#k${LogId}L$LineNo'$Title>$Label</a>" } -- 2.30.2

1 0

Re: [PATCH 3/3] winegstreamer: Check H264 ProcessOutput sample against actual image size.
by Marvin July 8, 2022

July 8, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=118553 Your paranoid android. === w864 (32 bit report) === mf: 04b0:mf: unhandled exception c0000005 at 0042ACE3 === w1064v1507 (32 bit report) === mf: 0da8:mf: unhandled exception c0000005 at 0042ACE3 === w1064v1809 (32 bit report) === mf: 1da0:mf: unhandled exception c0000005 at 0042ACE3 === w1064 (32 bit report) === mf: 1c6c:mf: unhandled exception c0000005 at 0042ACE3 === w1064_tsign (32 bit report) === mf: 0ea4:mf: unhandled exception c0000005 at 0042ACE3 === w10pro64 (32 bit report) === mf: 1e00:mf: unhandled exception c0000005 at 0042ACE3

1 0

[PATCH 0/3] MR395: win32u: Move reading and writing mode from registry out of graphics drivers.
by Rémi Bernon July 8, 2022

July 8, 2022

What was initially in https://gitlab.winehq.org/wine/wine/-/merge_requests/355, with the test failures hopefully fixed. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/395

3 8

[PATCH v3 0/4] MR375: ntdll: Fixes for runtime 64-bit shift functions.
by Zebediah Figura (＠zfigura) July 8, 2022

July 8, 2022

Based on <https://source.winehq.org/patches/data/238821> by Zhao Yi. -- v3: ntdll: Correctly handle shift greater than the type width in 64-bit shift functions. ntdll: Avoid depending on compiler support for 64-bit shift functions. ntdll/tests: Add tests for runtime 64-bit shift functions. ntdll: Fix the calling convention for runtime 64-bit shift functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/375

6 12

Re: [PATCH v4 5/7] scrrun: Check that source is directory in MoveFolder.
by Dmitry Timoshkov July 7, 2022

July 7, 2022

Robert Wilhelm <wine(a)gitlab.winehq.org> wrote: > --- a/dlls/scrrun/tests/filesystem.c > +++ b/dlls/scrrun/tests/filesystem.c > @@ -2605,6 +2605,7 @@ static void test_MoveFolder(void) > BSTR src, dst, str, empty; > WCHAR buffW1[MAX_PATH],buffW2[MAX_PATH]; > HRESULT hr; > + File *file; > > get_temp_path(L"foo", buffW1); > get_temp_path(L"bar", buffW2); > @@ -2648,6 +2649,19 @@ static void test_MoveFolder(void) > ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); > SysFreeString(src); > SysFreeString(dst); > + > + file = CreateFileW(buffW1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, > + FILE_ATTRIBUTE_NORMAL, NULL); > + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); > + CloseHandle(file); 'file' should have type HANDLE in this case. -- Dmitry.

1 0

[PATCH 0/5] MR399: XMLHttpRequest improvements
by Gabriel Ivăncescu July 7, 2022

July 7, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/399

3 9