wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Alexandre Julliard : winegcc: Fix subsystem check to avoid running winebuild on Unix libraries.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: a7076690b186ad876d2d12d9cc4b49cb692feed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7076690b186ad876d2d12d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 12:25:26 2021 +0200 winegcc: Fix subsystem check to avoid running winebuild on Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 710f6dc900d..5f8e6c0e086 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1387,7 +1387,7 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native"))) + if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "unixlib"))) spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (fake_module) return; /* nothing else to do */

1 0

Tim Clem : user32: Load libpng in DllMain.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: b4333216a73dbc97e09dcbcf194e8abed5f41ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4333216a73dbc97e09dcbcf… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Aug 26 13:01:19 2021 -0700 user32: Load libpng in DllMain. libpng is currently loaded on the first attempt to access a PNG icon or cursor. That creates a race condition that can deadlock the loader in certain circumstances if LoadIcon or LoadCursor is called while the loader lock is held, e.g. from a DllMain. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 21 +++------------------ dlls/user32/png.c | 4 ++-- dlls/user32/user_main.c | 3 +++ dlls/user32/user_private.h | 3 +++ 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7ad0a04a551..dc831db9287 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -111,21 +111,6 @@ static int get_display_bpp(void) return ret; } -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - -static const struct png_funcs *png_funcs; - -static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) -{ - __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); - return TRUE; -} - -static BOOL have_libpng(void) -{ - return InitOnceExecuteOnce( &init_once, load_libpng, NULL, NULL ) && png_funcs; -} - static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; @@ -571,7 +556,7 @@ static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, *width = icon->bWidth; *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; - if (!*width && !*height && have_libpng()) *width = *height = 256; + if (!*width && !*height && png_funcs) *width = *height = 256; return TRUE; } @@ -704,7 +689,7 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if (info->biSize == PNG_SIGN) { - if (have_libpng()) return png_funcs->get_png_info(info, size, width, height, bits); + if (png_funcs) return png_funcs->get_png_info(info, size, width, height, bits); *width = *height = *bits = 0; return TRUE; } @@ -858,7 +843,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE { BITMAPINFO *bmi_png; - if (!have_libpng()) return 0; + if (!png_funcs) return 0; bmi_png = png_funcs->load_png( (const char *)bmi, &maxsize ); if (bmi_png) { diff --git a/dlls/user32/png.c b/dlls/user32/png.c index a994c6de5c2..bcd619fe52b 100644 --- a/dlls/user32/png.c +++ b/dlls/user32/png.c @@ -293,7 +293,7 @@ static BITMAPINFO * CDECL load_png(const char *png_data, DWORD *size) return info; } -static const struct png_funcs png_funcs = +static const struct png_funcs funcs = { get_png_info, load_png @@ -335,7 +335,7 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p LOAD_FUNCPTR(png_set_read_fn); #undef LOAD_FUNCPTR - *(const struct png_funcs **)ptr_out = &png_funcs; + *(const struct png_funcs **)ptr_out = &funcs; return STATUS_SUCCESS; } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 303f19accfc..30e5d154d3d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -52,6 +52,8 @@ static HPALETTE hPrimaryPalette; static DWORD exiting_thread_id; +const struct png_funcs *png_funcs = NULL; + extern void WDML_NotifyThreadDetach(void); #ifdef __MINGW32__ @@ -332,6 +334,7 @@ static BOOL process_attach(void) palette_init(); keyboard_init(); + __wine_init_unix_lib( user32_module, DLL_PROCESS_ATTACH, NULL, &png_funcs ); return TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7c4d9015976..0be02919bbe 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -380,6 +380,9 @@ struct png_funcs BITMAPINFO * (CDECL *load_png)(const char *png_data, DWORD *size); }; +/* May be NULL if libpng cannot be loaded. */ +extern const struct png_funcs *png_funcs DECLSPEC_HIDDEN; + /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ #ifdef __MINGW32__ #undef assert

1 0

Huw Davies : ntdll: Remove unnecessary casts on macOS registers.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: dd37c3c4a04ef783ada136f561c0d4884a698713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd37c3c4a04ef783ada136f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 07:48:53 2021 +0100 ntdll: Remove unnecessary casts on macOS registers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e033a3987ee..1c1022886fc 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -313,8 +313,8 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define SS_sig(context) ((context)->uc_mcontext->__ss.__ss) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__esp)) +#define EIP_sig(context) ((context)->uc_mcontext->__ss.__eip) +#define ESP_sig(context) ((context)->uc_mcontext->__ss.__esp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) NULL diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8065f1b8220..a9bdbf62929 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -229,8 +229,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__rflags) -#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rip)) -#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rsp)) +#define RIP_sig(context) ((context)->uc_mcontext->__ss.__rip) +#define RSP_sig(context) ((context)->uc_mcontext->__ss.__rsp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw)

1 0

Huw Davies : ntdll: Remove old macOS register names.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 3fa8503de528eb8f86cc95e5b8e14db71a284a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fa8503de528eb8f86cc95e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 07:48:52 2021 +0100 ntdll: Remove old macOS register names. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 7067435bf0b..e033a3987ee 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -299,8 +299,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #include <i386/user_ldt.h> -/* work around silly renaming of struct members in OS X 10.5 */ -#if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32) #define EAX_sig(context) ((context)->uc_mcontext->__ss.__eax) #define EBX_sig(context) ((context)->uc_mcontext->__ss.__ebx) #define ECX_sig(context) ((context)->uc_mcontext->__ss.__ecx) @@ -322,29 +320,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define FPU_sig(context) NULL #define FPUX_sig(context) ((XSAVE_FORMAT *)&(context)->uc_mcontext->__fs.__fpu_fcw) #define XState_sig(context) NULL /* FIXME */ -#else -#define EAX_sig(context) ((context)->uc_mcontext->ss.eax) -#define EBX_sig(context) ((context)->uc_mcontext->ss.ebx) -#define ECX_sig(context) ((context)->uc_mcontext->ss.ecx) -#define EDX_sig(context) ((context)->uc_mcontext->ss.edx) -#define ESI_sig(context) ((context)->uc_mcontext->ss.esi) -#define EDI_sig(context) ((context)->uc_mcontext->ss.edi) -#define EBP_sig(context) ((context)->uc_mcontext->ss.ebp) -#define CS_sig(context) ((context)->uc_mcontext->ss.cs) -#define DS_sig(context) ((context)->uc_mcontext->ss.ds) -#define ES_sig(context) ((context)->uc_mcontext->ss.es) -#define FS_sig(context) ((context)->uc_mcontext->ss.fs) -#define GS_sig(context) ((context)->uc_mcontext->ss.gs) -#define SS_sig(context) ((context)->uc_mcontext->ss.ss) -#define EFL_sig(context) ((context)->uc_mcontext->ss.eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.esp)) -#define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) -#define ERROR_sig(context) ((context)->uc_mcontext->es.err) -#define FPU_sig(context) NULL -#define FPUX_sig(context) ((XSAVE_FORMAT *)&(context)->uc_mcontext->fs.fpu_fcw) -#define XState_sig(context) NULL /* FIXME */ -#endif #elif defined(__NetBSD__)

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement PsGetCurrentProcessSessionId.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 5aec01a7af42cd0b026a763f0c5d13e609a254f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aec01a7af42cd0b026a763f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 27 16:45:05 2021 +1000 ntoskrnl.exe: Implement PsGetCurrentProcessSessionId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36887 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1248300683..5c3a42c3d76 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3008,6 +3008,13 @@ HANDLE WINAPI PsGetCurrentProcessId(void) return KeGetCurrentThread()->id.UniqueProcess; } +/*********************************************************************** + * PsGetCurrentProcessSessionId (NTOSKRNL.EXE.@) + */ +ULONG WINAPI PsGetCurrentProcessSessionId(void) +{ + return PsGetCurrentProcess()->info.PebBaseAddress->SessionId; +} /*********************************************************************** * PsGetCurrentThreadId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 071dae6ceca..0208e2f633f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -888,7 +888,7 @@ @ stub PsGetContextThread @ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() -@ stub PsGetCurrentProcessSessionId +@ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Simplify expr_common_base_type.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: b5251b33502c74621f607ca283b848f3c1a8c115 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5251b33502c74621f607ca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Aug 27 12:05:13 2021 +0200 vkd3d-shader/hlsl: Simplify expr_common_base_type. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 69c42b6..7906356 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -905,37 +905,20 @@ static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - static const enum hlsl_base_type types[] = - { - HLSL_TYPE_BOOL, - HLSL_TYPE_INT, - HLSL_TYPE_UINT, - HLSL_TYPE_HALF, - HLSL_TYPE_FLOAT, - HLSL_TYPE_DOUBLE, - }; - int t1_idx = -1, t2_idx = -1, i; - - if (t1 == t2) - return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; - - for (i = 0; i < ARRAY_SIZE(types); ++i) - { - /* Always convert away from HLSL_TYPE_HALF */ - if (t1 == types[i]) - t1_idx = t1 == HLSL_TYPE_HALF ? i + 1 : i; - if (t2 == types[i]) - t2_idx = t2 == HLSL_TYPE_HALF ? i + 1 : i; - - if (t1_idx != -1 && t2_idx != -1) - break; - } - if (t1_idx == -1 || t2_idx == -1) - { + if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) { FIXME("Unexpected base type.\n"); return HLSL_TYPE_FLOAT; } - return t1_idx >= t2_idx ? t1 : t2; + if (t1 == t2) + return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; + if (t1 == HLSL_TYPE_DOUBLE || t2 == HLSL_TYPE_DOUBLE) + return HLSL_TYPE_DOUBLE; + if (t1 == HLSL_TYPE_FLOAT || t2 == HLSL_TYPE_FLOAT + || t1 == HLSL_TYPE_HALF || t2 == HLSL_TYPE_HALF) + return HLSL_TYPE_FLOAT; + if (t1 == HLSL_TYPE_UINT || t2 == HLSL_TYPE_UINT) + return HLSL_TYPE_UINT; + return HLSL_TYPE_INT; } static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct hlsl_type *t2,

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Return int as common type between bool and bool.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 176b12f9e4d8c209d10701a19085c1169bca0e60 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=176b12f9e4d8c209d10701a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Aug 27 12:05:12 2021 +0200 vkd3d-shader/hlsl: Return int as common type between bool and bool. So does the native d3dcompiler, following the spirit of integer promotion in C. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: 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 4c3c067..69c42b6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -917,7 +917,7 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl int t1_idx = -1, t2_idx = -1, i; if (t1 == t2) - return t1; + return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; for (i = 0; i < ARRAY_SIZE(types); ++i) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Move the base type equality case in expr_common_base_type.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 5a55e8e8d549e97c5947511c2849db5c08c1a5f1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5a55e8e8d549e97c5947511… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Aug 27 12:05:11 2021 +0200 vkd3d-shader/hlsl: Move the base type equality case in expr_common_base_type. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cb4fd7c..4c3c067 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -916,6 +916,9 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl }; int t1_idx = -1, t2_idx = -1, i; + if (t1 == t2) + return t1; + for (i = 0; i < ARRAY_SIZE(types); ++i) { /* Always convert away from HLSL_TYPE_HALF */ @@ -981,10 +984,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return NULL; } - if (t1->base_type == t2->base_type) - base = t1->base_type; - else - base = expr_common_base_type(t1->base_type, t2->base_type); + base = expr_common_base_type(t1->base_type, t2->base_type); if (t1->dimx == 1 && t1->dimy == 1) {

1 0

Matteo Bruni : include: Print failed allocation size.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 54bef05070a6d4f229746934fd46abcfbef02399 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54bef05070a6d4f22974693… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Aug 26 18:05:20 2021 +0200 include: Print failed allocation size. 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> --- include/private/vkd3d_memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index f6846d6..8a2edb1 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -37,7 +37,7 @@ static inline void *vkd3d_malloc(size_t size) static inline void *vkd3d_realloc(void *ptr, size_t size) { if (!(ptr = realloc(ptr, size))) - ERR("Out of memory.\n"); + ERR("Out of memory, size %zu.\n", size); return ptr; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 addition instructions.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: fbcdc7a9d4bf39eeb44c98df67e9632c1984e76c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fbcdc7a9d4bf39eeb44c98d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:12 2021 -0500 vkd3d-shader/hlsl: Write SM4 addition instructions. 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> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 9d0410a..c66f7b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -273,7 +273,6 @@ XFAIL_TESTS = \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ - tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 27058fe..32a4eda 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -894,6 +894,27 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } +static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); + instr.has_dst = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, src1); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + sm4_register_from_node(&instr.srcs[1].reg, &writemask, src2); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_constant(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant) { @@ -918,6 +939,43 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +static void write_sm4_expr(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) +{ + const struct hlsl_ir_node *arg1 = expr->operands[0].node; + const struct hlsl_ir_node *arg2 = expr->operands[1].node; + + assert(expr->node.reg.allocated); + + switch (expr->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + { + switch (expr->op) + { + case HLSL_OP2_ADD: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + + default: + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, expr->node.data_type))) + hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", string->buffer); + hlsl_release_string_buffer(ctx, string); + break; + } + } +} + static void write_sm4_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) { @@ -1044,6 +1102,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, write_sm4_constant(ctx, &buffer, hlsl_ir_constant(instr)); break; + case HLSL_IR_EXPR: + write_sm4_expr(ctx, &buffer, hlsl_ir_expr(instr)); + break; + case HLSL_IR_LOAD: write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021