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

Huw Davies : ntdll: Remove old macOS register names.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

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

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 245165e47f6a3b4c23087d44f0fb821a505dd143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245165e47f6a3b4c23087d44… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Aug 27 10:13:54 2021 +0200 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 92 +++++++++++++++++-------------------------------------------- 1 file changed, 26 insertions(+), 66 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index a5e42fd9831..f55f847a4c7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -21,26 +21,20 @@ msgid "Security" msgstr "Sikkerhet" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "Br&ukernavn:" +msgstr "&Gruppe eller brukernavn:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Gul" +msgstr "Tillat" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Nekt" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Tilgang nektet.\n" +msgstr "Tilgang for %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3769,7 +3763,7 @@ msgstr "Spillkontrollere" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Test og konfigurer spillkontrollere." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3875,7 +3869,7 @@ msgstr "Forventet '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript kompileringsfeil" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" @@ -6969,38 +6963,28 @@ msgid "Connection reset by peer.\n" msgstr "Tilkobling nullstilt av likemann.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Ikke implementert" +msgstr "Ikke implementert.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-kall feilet.\n" +msgstr "Kall feilet.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Fant ingen signatur i filen.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Ugyldig nivå.\n" +msgstr "Ugyldig kall.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Verdi er ikke tilgjengelig.\n" +msgstr "Ressursen er for øyeblikket ikke tilgjengelig.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenavn:" +msgstr "Klassisk Blå" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -9200,32 +9184,24 @@ msgid "Provider" msgstr "Tilbyder" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Velg data du ønsker å koble til:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Nettverksforbindelser" +msgstr "Nettverksforbindelse" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Spesifiser følgende for å koble til ODBC-data:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Spesifiser datakilden:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Skriv inn navnet ditt" +msgstr "Bruk &datakilde-navnet" #: dlls/oledb32/version.rc:74 #, fuzzy @@ -9250,64 +9226,48 @@ msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "Br&ukernavn:" +msgstr "Bruker&navn:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tom side" +msgstr "&Blankt passord" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Feil passord.\n" +msgstr "Tillat lagring av pa%ssord" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Tilbakestill tilkoblinger" +msgstr "&Test tilkobling" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avansert" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Nettverksressurs" +msgstr "Nettverksinnstillinger" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Ugyldig personifiseringsnivå.\n" +msgstr "Person&ifiseringsnivå:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Tilkoblet" +msgstr "Koble til:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "sekunder" +msgstr "sekunder." #: dlls/oledb32/version.rc:104 #, fuzzy @@ -10371,7 +10331,7 @@ msgstr "Nedlastinger" #: dlls/shell32/shell32.rc:169 msgid "Unable to create new Folder: Permission denied." -msgstr "Kunne ikke opprette ny mappe: tilgang nektet." +msgstr "Kunne ikke opprette ny mappe: Tilgang nektet." #: dlls/shell32/shell32.rc:170 msgid "Error during creation of a new folder" @@ -13957,7 +13917,7 @@ msgstr "Ethernet" #: programs/ipconfig/ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "TIlkoblingsspesifikt DNS-suffiks" +msgstr "Tilkoblingsspesifikt DNS-suffiks" #: programs/ipconfig/ipconfig.rc:36 msgid "IPv4 address"

1 0

Michael Stefaniuc : d3dx10: Remove redundant NULL check before heap_free().
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 460ca9a9b5ef0fd667cac3281eea8aac15076909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460ca9a9b5ef0fd667cac328… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 25 22:39:07 2021 +0200 d3dx10: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8d30aef8648..32215b0a99a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -709,8 +709,7 @@ end: IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); - if (buffer) - heap_free(buffer); + heap_free(buffer); if (frame) IWICBitmapFrameDecode_Release(frame); if (decoder)

1 0

Nikolay Sivov : d3d10/effect: Warn only when ignored default variable value is specified.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 624b33bfb83715a5431753e1f94e28dfad5af64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=624b33bfb83715a5431753e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:11 2021 +0300 d3d10/effect: Warn only when ignored default variable value is specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3b3d48c50a8..9312cfec6f6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1814,10 +1814,10 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, return S_OK; } -static HRESULT parse_fx10_variable(const char *data, size_t data_size, +static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *v) { - DWORD offset; + DWORD offset, default_value_offset; unsigned int i; HRESULT hr; @@ -1837,11 +1837,14 @@ static HRESULT parse_fx10_variable(const char *data, size_t data_size, read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); - skip_dword_unknown("variable", ptr, 1); + read_dword(ptr, &default_value_offset); read_dword(ptr, &v->flag); TRACE("Variable flag: %#x.\n", v->flag); + if (default_value_offset) + FIXME("Set default variable value.\n"); + read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); @@ -2230,7 +2233,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, v->buffer = l; v->effect = l->effect; - if (FAILED(hr = parse_fx10_variable(data, data_size, ptr, v))) + if (FAILED(hr = parse_fx10_numeric_variable(data, data_size, ptr, v))) return hr; /*

1 0

Tim Clem : user32: Load libpng in DllMain.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

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

Zebediah Figura : vkd3d-shader/hlsl: Avoid crashing when emitting a dereference with non-constant offset.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: vkd3d Branch: master Commit: ac88631755646d7e471056aa878cbba4a933727e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ac88631755646d7e471056a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:07 2021 -0500 vkd3d-shader/hlsl: Avoid crashing when emitting a dereference with non-constant offset. Some places assert() that the register is allocated. 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 | 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 c2aeb7b..2759201 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1200,7 +1200,7 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct if (offset_node && offset_node->type != HLSL_IR_CONSTANT) { FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type)); - return ret; + offset_node = NULL; } ret = var->reg;

1 0

Matteo Bruni : include: Print failed allocation size.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

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

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

Aug. 27, 2021

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

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 swizzle instructions.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: vkd3d Branch: master Commit: 32fd18837b37aac1a3fedc3d0ade91559ccedfae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32fd18837b37aac1a3fedc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:10 2021 -0500 vkd3d-shader/hlsl: Write SM4 swizzle 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> --- libs/vkd3d-shader/hlsl_sm4.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 723b600..73bac7b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -925,6 +925,26 @@ static void write_sm4_store(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +static void write_sm4_swizzle(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &swizzle->node); + instr.has_dst = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, swizzle->val.node); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_combine_swizzles(hlsl_swizzle_from_writemask(writemask), + swizzle->swizzle, swizzle->node.data_type->dimx), instr.dst.writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *entry_func, struct dxbc_writer *dxbc) { @@ -989,6 +1009,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); break; + case HLSL_IR_SWIZZLE: + write_sm4_swizzle(ctx, &buffer, hlsl_ir_swizzle(instr)); + break; + default: FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 load instructions.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: vkd3d Branch: master Commit: 51b8c46b9d81d7f1ba75d4211f0e22952e9e8f82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=51b8c46b9d81d7f1ba75d42… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:09 2021 -0500 vkd3d-shader/hlsl: Write SM4 load 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 | 60 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fc1714f..1bbe1c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,6 @@ XFAIL_TESTS = \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-semantics.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 2e304c5..723b600 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -605,7 +605,42 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r { const struct hlsl_ir_var *var = deref->var; - if (var->is_output_semantic) + if (var->is_uniform) + { + reg->type = VKD3D_SM4_RT_CONSTBUFFER; + reg->idx[0] = var->buffer->reg.id; + reg->idx[1] = var->buffer_offset / 4; + reg->idx_count = 2; + *writemask = ((1u << data_type->dimx) - 1) << (var->buffer_offset & 3); + } + else if (var->is_input_semantic) + { + bool has_idx; + + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, &has_idx)) + { + if (has_idx) + { + reg->idx[0] = var->semantic.index; + reg->idx_count = 1; + } + + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + *writemask = (1u << data_type->dimx) - 1; + } + else + { + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(deref, data_type); + + assert(hlsl_reg.allocated); + reg->type = VKD3D_SM4_RT_INPUT; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + reg->idx[0] = hlsl_reg.id; + reg->idx_count = 1; + *writemask = hlsl_reg.writemask; + } + } + else if (var->is_output_semantic) { bool has_idx; @@ -844,6 +879,25 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } +static void write_sm4_load(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &load->node); + instr.has_dst = 1; + + sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &load->src, load->node.data_type); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_store *store) { @@ -927,6 +981,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, switch (instr->type) { + case HLSL_IR_LOAD: + write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); + break; + case HLSL_IR_STORE: write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); break;

1 0