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

Alexandre Julliard : kernelbase: Avoid depending on the mount manager in CopyFileExW().
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 4d7b49eae6613246f623957d2f7686a94a13010b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d7b49eae6613246f623957d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 10:21:42 2021 +0100 kernelbase: Avoid depending on the mount manager in CopyFileExW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 765bb41ab98..23a36b0a765 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -499,7 +499,8 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT { static const int buffer_size = 65536; HANDLE h1, h2; - BY_HANDLE_FILE_INFORMATION info; + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; DWORD count; BOOL ret = FALSE; char *buffer; @@ -525,7 +526,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } - if (!GetFileInformationByHandle( h1, &info )) + if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) { WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -553,7 +554,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, - info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) + info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open dest %s\n", debugstr_w(dest)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -575,7 +576,8 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT ret = TRUE; done: /* Maintain the timestamp of source file to destination file */ - SetFileTime( h2, NULL, NULL, &info.ftLastWriteTime ); + info.FileAttributes = 0; + NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); CloseHandle( h2 );

1 0

Alexandre Julliard : msvcrt: Avoid depending on the mount manager in fstat().
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 23ed647773546ab3e0817580f6ac28ed8c948c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ed647773546ab3e0817580… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 10:29:28 2021 +0100 msvcrt: Avoid depending on the mount manager in fstat(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 89d6e7d721f..bf7496cc233 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1754,7 +1754,6 @@ int CDECL _fstat64(int fd, struct _stat64* buf) ioinfo *info = get_ioinfo(fd); DWORD dw; DWORD type; - BY_HANDLE_FILE_INFORMATION hfi; TRACE(":fd (%d) stat (%p)\n", fd, buf); if (info->handle == INVALID_HANDLE_VALUE) @@ -1771,7 +1770,6 @@ int CDECL _fstat64(int fd, struct _stat64* buf) return -1; } - memset(&hfi, 0, sizeof(hfi)); memset(buf, 0, sizeof(struct _stat64)); type = GetFileType(info->handle); if (type == FILE_TYPE_PIPE) @@ -1788,25 +1786,30 @@ int CDECL _fstat64(int fd, struct _stat64* buf) } else /* FILE_TYPE_DISK etc. */ { - if (!GetFileInformationByHandle(info->handle, &hfi)) + FILE_BASIC_INFORMATION basic_info; + FILE_STANDARD_INFORMATION std_info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + if ((status = NtQueryInformationFile( info->handle, &io, &basic_info, sizeof(basic_info), FileBasicInformation )) || + (status = NtQueryInformationFile( info->handle, &io, &std_info, sizeof(std_info), FileStandardInformation ))) { - WARN(":failed-last error (%d)\n",GetLastError()); + WARN(":failed-error %x\n",status); msvcrt_set_errno(ERROR_INVALID_PARAMETER); release_ioinfo(info); return -1; } buf->st_mode = _S_IFREG | 0444; - if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) + if (!(basic_info.FileAttributes & FILE_ATTRIBUTE_READONLY)) buf->st_mode |= 0222; - buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; - RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); + buf->st_size = std_info.EndOfFile.QuadPart; + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastAccessTime, &dw); buf->st_atime = dw; - RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastWriteTime, &dw); + RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; - buf->st_nlink = hfi.nNumberOfLinks; + buf->st_nlink = std_info.NumberOfLinks; + TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",basic_info.FileAttributes, buf->st_mode); } - TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes, - buf->st_mode); release_ioinfo(info); return 0; }

1 0

Alexandre Julliard : ntoskrnl: Load driver dependencies from the driver directory.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 31816a90c604f209387dda887a17ac9a8072a2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31816a90c604f209387dda88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 11:49:16 2021 +0100 ntoskrnl: Load driver dependencies from the driver directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a818a6e88b3..066e87cf977 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3691,7 +3691,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); - module = LoadLibraryW( str ); + module = LoadLibraryExW( str, 0, LOAD_WITH_ALTERED_SEARCH_PATH ); if (module && load_image_notify_routine_count) {

1 0

Alexandre Julliard : ntdll: Check the builtin signature when creating a module.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: wine Branch: master Commit: 4ea07a30ce25e63ba61012ec9886ffc636e70bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ea07a30ce25e63ba61012ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 17 10:36:47 2021 +0100 ntdll: Check the builtin signature when creating a module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 04bcdb18a2b..092c47eac3b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1832,6 +1832,9 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, const SECTION_IMAGE_INFORMATION *image_info, const struct file_id *id, DWORD flags, WINE_MODREF **pwm ) { + static const char builtin_signature[] = "Wine builtin DLL"; + char *signature = (char *)((IMAGE_DOS_HEADER *)*module + 1); + BOOL is_builtin; IMAGE_NT_HEADERS *nt; WINE_MODREF *wm; NTSTATUS status; @@ -1842,10 +1845,12 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, map_size = (nt->OptionalHeader.SizeOfImage + page_size - 1) & ~(page_size - 1); if ((status = perform_relocations( *module, nt, map_size ))) return status; + is_builtin = ((char *)nt - signature >= sizeof(builtin_signature) && + !memcmp( signature, builtin_signature, sizeof(builtin_signature) )); + /* create the MODREF */ - if (!(wm = alloc_module( *module, nt_name, (image_info->u.s.WineBuiltin) ))) - return STATUS_NO_MEMORY; + if (!(wm = alloc_module( *module, nt_name, is_builtin ))) return STATUS_NO_MEMORY; if (id) wm->id = *id; if (image_info->LoaderFlags) wm->ldr.Flags |= LDR_COR_IMAGE; @@ -1883,7 +1888,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, TRACE( "loaded %s %p %p\n", debugstr_us(nt_name), wm, *module ); - if (image_info->u.s.WineBuiltin) + if (is_builtin) { if (TRACE_ON(relay)) RELAY_SetupDLL( *module ); } @@ -1893,7 +1898,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, } TRACE_(loaddll)( "Loaded %s at %p: %s\n", debugstr_w(wm->ldr.FullDllName.Buffer), *module, - (image_info->u.s.WineBuiltin) ? "builtin" : "native" ); + is_builtin ? "builtin" : "native" ); wm->ldr.LoadCount = 1; *pwm = wm; @@ -2319,7 +2324,6 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { SECTION_IMAGE_INFORMATION image_info = { 0 }; - image_info.u.s.WineBuiltin = 1; if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, &wm ))) { if (module) NtUnmapViewOfSection( NtCurrentProcess(), module );

1 0

Zebediah Figura : vkd3d-shader: Factor out hlsl_new_copy().
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: vkd3d Branch: master Commit: 8096e4ae7ba8fcd81ab60d1fdc71608475441f9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8096e4ae7ba8fcd81ab60d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:52 2021 -0500 vkd3d-shader: Factor out hlsl_new_copy(). 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 | 6 ++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 +++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 19c0e2e..988f64d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -382,6 +382,12 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * return hlsl_ir_expr(cast); } +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) +{ + /* Use a cast to the same type as a makeshift identity expression. */ + return hlsl_new_cast(node, node->data_type, &node->loc); +} + struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5a2f6af..92ac527 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -525,6 +525,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6fceafb..afac0ab 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1336,9 +1336,8 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in /* Don't use the instruction itself as a source, as this makes structure * splitting easier. Instead copy it here. Since we retrieve sources from - * the last instruction in the list, we do need to copy. Use a cast - * instruction to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + * the last instruction in the list, we do need to copy. */ + if (!(copy = hlsl_new_copy(rhs))) return NULL; list_add_tail(instrs, &copy->node.entry); return &copy->node; @@ -1365,8 +1364,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem { struct hlsl_ir_expr *copy; - /* Use a cast to the same type as a makeshift identity expression. */ - if (!(copy = hlsl_new_cast(lhs, lhs->data_type, &lhs->loc))) + if (!(copy = hlsl_new_copy(lhs))) return false; list_add_tail(instrs, &copy->node.entry);

1 0

Zebediah Figura : vkd3d-shader: Fold addition and multiplication of uint constants.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: vkd3d Branch: master Commit: 14993f34c99617881ea569f8f687dcc4a349a383 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=14993f34c99617881ea569f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:53 2021 -0500 vkd3d-shader: Fold addition and multiplication of uint constants. 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_codegen.c | 102 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 3998470..c8d8d17 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -20,6 +20,106 @@ #include "hlsl.h" +static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), + struct list *instrs, void *context) +{ + struct hlsl_ir_node *instr, *next; + bool progress = 0; + + LIST_FOR_EACH_ENTRY_SAFE(instr, next, instrs, struct hlsl_ir_node, entry) + { + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + progress |= transform_ir(ctx, func, &iff->then_instrs, context); + progress |= transform_ir(ctx, func, &iff->else_instrs, context); + } + else if (instr->type == HLSL_IR_LOOP) + progress |= transform_ir(ctx, func, &hlsl_ir_loop(instr)->body, context); + + progress |= func(ctx, instr, context); + } + + return progress; +} + +static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) +{ + struct hlsl_src *src, *next; + + LIST_FOR_EACH_ENTRY_SAFE(src, next, &old->uses, struct hlsl_src, entry) + { + hlsl_src_remove(src); + hlsl_src_from_node(src, new); + } + list_add_before(&old->entry, &new->entry); + list_remove(&old->entry); + hlsl_free_instr(old); +} + +static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; + struct hlsl_ir_expr *expr; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + { + if (expr->operands[i].node && expr->operands[i].node->type != HLSL_IR_CONSTANT) + return false; + } + arg1 = hlsl_ir_constant(expr->operands[0].node); + if (expr->operands[1].node) + arg2 = hlsl_ir_constant(expr->operands[1].node); + + if (!(res = vkd3d_calloc(1, sizeof(*res)))) + { + ctx->failed = true; + return false; + } + init_node(&res->node, HLSL_IR_CONSTANT, instr->data_type, instr->loc); + + switch (instr->data_type->base_type) + { + case HLSL_TYPE_UINT: + { + unsigned int i; + + switch (expr->op) + { + case HLSL_IR_BINOP_ADD: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value.u[i] = arg1->value.u[i] + arg2->value.u[i]; + break; + + case HLSL_IR_BINOP_MUL: + for (i = 0; i < instr->data_type->dimx; ++i) + res->value.u[i] = arg1->value.u[i] * arg2->value.u[i]; + break; + + default: + FIXME("Fold uint op %#x.\n", expr->op); + vkd3d_free(res); + return false; + } + break; + } + + default: + FIXME("Fold type %#x op %#x.\n", instr->data_type->base_type, expr->op); + vkd3d_free(res); + return false; + } + + replace_node(&expr->node, &res->node); + return true; +} + /* Allocate a unique, ordered index to each instruction, which will be used for * computing liveness ranges. */ static unsigned int index_instructions(struct list *instrs, unsigned int index) @@ -163,6 +263,8 @@ 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_constants, entry_func->body, NULL)); + /* Index 0 means unused; index 1 means function entry, so start at 2. */ index_instructions(entry_func->body, 2);

1 0

Zebediah Figura : vkd3d-shader: Add a dead code elimination pass.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: vkd3d Branch: master Commit: 7c2083d37414ba0200d0ecca736b16fdd8c0491d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7c2083d37414ba0200d0ecc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:54 2021 -0500 vkd3d-shader: Add a dead code elimination pass. 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 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c8d8d17..22ad3ed 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -120,6 +120,32 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + switch (instr->type) + { + case HLSL_IR_CONSTANT: + case HLSL_IR_EXPR: + case HLSL_IR_LOAD: + case HLSL_IR_SWIZZLE: + if (list_empty(&instr->uses)) + { + list_remove(&instr->entry); + hlsl_free_instr(instr); + return true; + } + break; + + case HLSL_IR_ASSIGNMENT: + case HLSL_IR_IF: + case HLSL_IR_JUMP: + case HLSL_IR_LOOP: + break; + } + + return false; +} + /* Allocate a unique, ordered index to each instruction, which will be used for * computing liveness ranges. */ static unsigned int index_instructions(struct list *instrs, unsigned int index) @@ -264,6 +290,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_constants, entry_func->body, NULL)); + 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);

1 0

Zebediah Figura : vkd3d-shader: Fold redundant casts.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: vkd3d Branch: master Commit: 79d4e629110b08a35465a734eeea817fa53e0deb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=79d4e629110b08a35465a73… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:55 2021 -0500 vkd3d-shader: Fold redundant casts. 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_codegen.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 22ad3ed..2df88f5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -53,11 +53,26 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_src_remove(src); hlsl_src_from_node(src, new); } - list_add_before(&old->entry, &new->entry); list_remove(&old->entry); hlsl_free_instr(old); } +static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + if (instr->type == HLSL_IR_EXPR) + { + struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + + if (expr->op == HLSL_IR_UNOP_CAST && hlsl_type_compare(expr->node.data_type, expr->operands[0].node->data_type)) + { + replace_node(&expr->node, expr->operands[0].node); + return true; + } + } + + return false; +} + static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -116,6 +131,7 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return false; } + list_add_before(&expr->node.entry, &res->node.entry); replace_node(&expr->node, &res->node); return true; } @@ -289,6 +305,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, fold_constants, entry_func->body, NULL)); while (transform_ir(ctx, dce, entry_func->body, NULL));

1 0

Zebediah Figura : vkd3d-shader: Fold redundant casts between scalars and 1-dimensional vectors.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: vkd3d Branch: master Commit: 1b7cc143655efd3d2d9edf492fcde6eb5af6d389 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1b7cc143655efd3d2d9edf4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 16 16:31:56 2021 -0500 vkd3d-shader: Fold redundant casts between scalars and 1-dimensional vectors. 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_codegen.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2df88f5..283a67e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -57,13 +57,24 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_free_instr(old); } +static bool is_vec1(const struct hlsl_type *type) +{ + return (type->type == HLSL_CLASS_SCALAR) || (type->type == HLSL_CLASS_VECTOR && type->dimx == 1); +} + static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { if (instr->type == HLSL_IR_EXPR) { struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + const struct hlsl_type *src_type = expr->operands[0].node->data_type; + const struct hlsl_type *dst_type = expr->node.data_type; + + if (expr->op != HLSL_IR_UNOP_CAST) + return false; - if (expr->op == HLSL_IR_UNOP_CAST && hlsl_type_compare(expr->node.data_type, expr->operands[0].node->data_type)) + if (hlsl_type_compare(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); return true;

1 0

Matteo Bruni : vkd3d-shader: Get rid of a spurious '\n' in a HLSL compiler message.
by Alexandre Julliard 17 Mar '21

17 Mar '21

Module: vkd3d Branch: master Commit: 588d3e5a576870f093d0789412a3974675345412 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=588d3e5a576870f093d0789… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 17 13:38:14 2021 +0100 vkd3d-shader: Get rid of a spurious '\n' in a HLSL compiler message. 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.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index afac0ab..4769475 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -755,7 +755,7 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->semantic = v->semantic; if (v->initializer.args_count) { - hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.\n"); + hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); free_parse_initializer(&v->initializer); } list_add_tail(list, &field->entry);

1 0