wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : winemenubuilder: Use Unicode strings to process association entries.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 41881ff6257cee6624372da71eee62435e30d7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=41881ff6257cee6624372da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:25:27 2021 +0200 winemenubuilder: Use Unicode strings to process association entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 324 ++++++++++++++--------------- 1 file changed, 156 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41881ff6257cee662437…

1 0

Alexandre Julliard : winemenubuilder: Launch .lnk files directly through the Wine loader.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 542d67342db8b77af8244328ca175f91cb504e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=542d67342db8b77af8244328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:20:15 2021 +0200 winemenubuilder: Launch .lnk files directly through the Wine loader. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 59 ++++-------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 06d1e655195..c0701d0241f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2492,10 +2492,8 @@ static char *get_start_exe_path(void) static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { - static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', - '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; - char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; + char *description = NULL; char *wmclass = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; @@ -2503,7 +2501,6 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) int iIconId = 0, r = -1; DWORD csidl = -1; HANDLE hsem = NULL; - char *start_path = NULL; if ( !link ) { @@ -2574,37 +2571,11 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* check the path */ if( szPath[0] ) { - static const WCHAR exeW[] = {'.','e','x','e',0}; - WCHAR *p; - - /* check for .exe extension */ - if (!(p = strrchrW( szPath, '.' )) || - strchrW( p, '\\' ) || strchrW( p, '/' ) || - lstrcmpiW( p, exeW )) - { - /* Not .exe - use 'start.exe' to launch this file */ - p = szArgs + lstrlenW(szPath) + 2; - if (szArgs[0]) - { - p[0] = ' '; - memmove( p+1, szArgs, min( (lstrlenW(szArgs) + 1) * sizeof(szArgs[0]), - sizeof(szArgs) - (p + 1 - szArgs) * sizeof(szArgs[0]) ) ); - } - else - p[0] = 0; + /* FIXME: Use AppUserModelID if present. */ + WCHAR *p = PathFindFileNameW(szPath); - szArgs[0] = '"'; - lstrcpyW(szArgs + 1, szPath); - szArgs[lstrlenW(szArgs)] = '"'; - - GetWindowsDirectoryW(szPath, MAX_PATH); - lstrcatW(szPath, startW); - } - else + if (p) { - /* FIXME: Use AppUserModelID if present. */ - WCHAR *p = PathFindFileNameW(szPath); - lstrcpyW(szWMClass, p); CharLowerW(szWMClass); } @@ -2613,20 +2584,9 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (szWorkDir[0]) work_dir = wine_get_unix_file_name( szWorkDir ); } - else - { - /* if there's no path... try run the link itself */ - lstrcpynW(szArgs, link, MAX_PATH); - GetWindowsDirectoryW(szPath, MAX_PATH); - lstrcatW(szPath, startW); - } - /* escape the path and parameters */ - escaped_path = escape(szPath); - escaped_args = escape(szArgs); description = wchars_to_utf8_chars(szDescription); wmclass = wchars_to_utf8_chars(szWMClass); - start_path = get_start_exe_path(); /* building multiple menus concurrently has race conditions */ hsem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); @@ -2646,17 +2606,17 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) else ++lastEntry; location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); - if (csidl == CSIDL_COMMON_DESKTOPDIRECTORY) - r = !write_desktop_entry(link, location, lastEntry, start_path, escape(link), + if (csidl == CSIDL_COMMON_DESKTOPDIRECTORY || !szPath[0]) + r = !write_desktop_entry(link, location, lastEntry, escape(link), "", description, work_dir, icon_name, wmclass); else - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name, wmclass); + r = !write_desktop_entry(NULL, location, lastEntry, escape(szPath), escape(szArgs), description, work_dir, icon_name, wmclass); if (r == 0) chmod(location, 0755); heap_free(location); } else - r = !write_menu_entry(link, link_name, start_path, escape(link), + r = !write_menu_entry(link, link_name, escape(link), "", description, work_dir, icon_name, wmclass); ReleaseSemaphore( hsem, 1, NULL ); @@ -2666,11 +2626,8 @@ cleanup: heap_free(icon_name ); heap_free(work_dir ); heap_free(link_name ); - heap_free(escaped_args ); - heap_free(escaped_path ); heap_free(description ); heap_free(wmclass ); - heap_free(start_path ); if (r && !bWait) WINE_ERR("failed to build the menu\n" );

1 0

Alexandre Julliard : winemenubuilder: Store the paths of .lnk files as DOS paths.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 56701db4741787546095af2bd67c06f421445241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56701db4741787546095af2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:19:27 2021 +0200 winemenubuilder: Store the paths of .lnk files as DOS paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 87 ++++++++---------------------- 1 file changed, 21 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56701db4741787546095…

1 0

Alexandre Julliard : winemenubuilder: Use PathMatchSpec() instead of fnmatch().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: e14f3c40cdf4eb638951c12396f94a9a0919d71e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14f3c40cdf4eb638951c123… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 09:36:17 2021 +0200 winemenubuilder: Use PathMatchSpec() instead of fnmatch(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- include/config.h.in | 6 ---- programs/winemenubuilder/winemenubuilder.c | 49 +++++------------------------- 4 files changed, 8 insertions(+), 51 deletions(-) diff --git a/configure b/configure index eca83982196..038391a4439 100755 --- a/configure +++ b/configure @@ -7481,7 +7481,6 @@ for ac_header in \ dlfcn.h \ elf.h \ float.h \ - fnmatch.h \ getopt.h \ gettext-po.h \ grp.h \ @@ -17902,7 +17901,6 @@ for ac_func in \ __res_getservers \ _spawnvp \ epoll_create \ - fnmatch \ fork \ fstatfs \ futimens \ diff --git a/configure.ac b/configure.ac index 7ed1e73eb6d..da80562c445 100644 --- a/configure.ac +++ b/configure.ac @@ -450,7 +450,6 @@ AC_CHECK_HEADERS(\ dlfcn.h \ elf.h \ float.h \ - fnmatch.h \ getopt.h \ gettext-po.h \ grp.h \ @@ -2132,7 +2131,6 @@ AC_CHECK_FUNCS(\ __res_getservers \ _spawnvp \ epoll_create \ - fnmatch \ fork \ fstatfs \ futimens \ diff --git a/include/config.h.in b/include/config.h.in index dac43f7840e..80cc9c3a47f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -96,12 +96,6 @@ /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H -/* Define to 1 if you have the `fnmatch' function. */ -#undef HAVE_FNMATCH - -/* Define to 1 if you have the <fnmatch.h> header file. */ -#undef HAVE_FNMATCH_H - /* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ #undef HAVE_FONTCONFIG_FONTCONFIG_H diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 06f3cb50705..a4f1ee26e9c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -73,9 +73,6 @@ #endif #include <errno.h> #include <stdarg.h> -#ifdef HAVE_FNMATCH_H -#include <fnmatch.h> -#endif #define COBJMACROS #define NONAMELESSUNION @@ -181,7 +178,6 @@ struct xdg_mime_type { char *mimeType; char *glob; - char *lower_glob; struct list entry; }; @@ -1936,7 +1932,7 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) int size = 0; while (ret && (ret = next_line(globs_file, &line, &size)) && line) { - char *pos, *l; + char *pos; struct xdg_mime_type *mime_type_entry = NULL; if (line[0] != '#' && (pos = strchr(line, ':'))) { @@ -1944,9 +1940,6 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) *pos = 0; mime_type_entry->mimeType = xstrdup(line); mime_type_entry->glob = xstrdup(pos + 1); - mime_type_entry->lower_glob = xstrdup(pos + 1); - for (l = mime_type_entry->lower_glob; *l; l++) - *l = tolower(*l); list_add_tail(mime_types, &mime_type_entry->entry); } } @@ -1965,7 +1958,6 @@ static void free_native_mime_types(struct list *native_mime_types) { list_remove(&mime_type_entry->entry); heap_free(mime_type_entry->glob); - heap_free(mime_type_entry->lower_glob); heap_free(mime_type_entry->mimeType); heap_free(mime_type_entry); } @@ -2005,10 +1997,11 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list *mime return ret; } -static BOOL match_glob(struct list *native_mime_types, const char *extension, - int ignoreGlobCase, char **match) +static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, + const char *extensionA, + LPCWSTR extensionW, + char **match) { -#ifdef HAVE_FNMATCH struct xdg_mime_type *mime_type_entry; int matchLength = 0; @@ -2016,46 +2009,20 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { - const char *glob = ignoreGlobCase ? mime_type_entry->lower_glob : mime_type_entry->glob; - if (fnmatch(glob, extension, 0) == 0) + if (PathMatchSpecA( extensionA, mime_type_entry->glob )) { - if (*match == NULL || matchLength < strlen(glob)) + if (*match == NULL || matchLength < strlen(mime_type_entry->glob)) { *match = mime_type_entry->mimeType; - matchLength = strlen(glob); + matchLength = strlen(mime_type_entry->glob); } } } if (*match != NULL) *match = xstrdup(*match); -#else - *match = NULL; -#endif return TRUE; } -static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, - const char *extensionA, - LPCWSTR extensionW, - char **mime_type) -{ - WCHAR *lower_extensionW; - char *lower_extensionA; - INT len; - BOOL ret = match_glob(native_mime_types, extensionA, 0, mime_type); - if (ret == FALSE || *mime_type != NULL) - return ret; - len = strlenW(extensionW); - lower_extensionW = xmalloc((len + 1)*sizeof(WCHAR)); - memcpy(lower_extensionW, extensionW, (len + 1)*sizeof(WCHAR)); - strlwrW(lower_extensionW); - lower_extensionA = wchars_to_utf8_chars(lower_extensionW); - ret = match_glob(native_mime_types, lower_extensionA, 1, mime_type); - heap_free(lower_extensionA); - heap_free(lower_extensionW); - return ret; -} - static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size;

1 0

Alexandre Julliard : winemenubuilder: Abort on memory allocation failures.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 982a712c4dd3cee20aacc42afc2ee255f48fa4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=982a712c4dd3cee20aacc42a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 09:35:48 2021 +0200 winemenubuilder: Abort on memory allocation failures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 1006 ++++++++++------------------ 1 file changed, 336 insertions(+), 670 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=982a712c4dd3cee20aac…

1 0

Matteo Bruni : vkd3d-shader: Allocate memory for a string buffer at init time.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: 49eba718443ad2df238180377ae45e4234f3c8f3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49eba718443ad2df2381803… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 30 21:36:17 2021 +0200 vkd3d-shader: Allocate memory for a string buffer at init time. 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/vkd3d_shader_main.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index baf2561..ef9eaef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -25,7 +25,11 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - memset(buffer, 0, sizeof(*buffer)); + buffer->buffer_size = 16; + buffer->content_size = 0; + buffer->buffer = vkd3d_malloc(buffer->buffer_size); + assert(buffer->buffer); + memset(buffer->buffer, 0, buffer->buffer_size); } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -41,7 +45,7 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : buffer->buffer_size * 2; if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { @@ -58,9 +62,6 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * va_list a; int rc; - if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32)) - return -1; - for (;;) { rem = buffer->buffer_size - buffer->content_size; @@ -144,11 +145,6 @@ struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_c if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) return NULL; vkd3d_string_buffer_init(buffer); - if (!vkd3d_string_buffer_resize(buffer, 1)) - { - vkd3d_free(buffer); - return NULL; - } } else {

1 0

Matteo Bruni : vkd3d-shader: Don't resize the buffer when there is enough free space.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: c3f85314772d590312fc015135cd9d794b0e9ff2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3f85314772d590312fc015… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 30 21:36:16 2021 +0200 vkd3d-shader: Don't resize the buffer when there is enough free space. 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/vkd3d_shader_main.c | 10 ++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e38261b..baf2561 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,20 +41,14 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; - char *new_buffer; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); - new_buffer_size = max(new_buffer_size, 32); - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) + if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return false; } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8b3e762..fa56ba1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -912,8 +912,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer { char *buffer; - unsigned int buffer_size; - unsigned int content_size; + size_t buffer_size, content_size; }; struct vkd3d_string_buffer_cache

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass the original name string to hlsl_new_type().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: a1f938e8e41cca53148ad4fd9d2d198ec02f9092 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1f938e8e41cca53148ad4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:47 2021 -0500 vkd3d-shader/hlsl: Pass the original name string to hlsl_new_type(). 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fc6d1e4..66ca389 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -207,7 +207,11 @@ static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, e if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; - type->name = name; + if (!(type->name = hlsl_strdup(ctx, name))) + { + vkd3d_free(type); + return NULL; + } type->type = type_class; type->base_type = base_type; type->dimx = dimx; @@ -1656,21 +1660,21 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (x = 1; x <= 4; ++x) { sprintf(name, "%s%ux%u", names[bt], y, x); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_MATRIX, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.matrix[bt][x - 1][y - 1] = type; if (y == 1) { sprintf(name, "%s%u", names[bt], x); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_VECTOR, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.vector[bt][x - 1] = type; if (x == 1) { sprintf(name, "%s", names[bt]); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_SCALAR, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.scalar[bt] = type; } @@ -1681,16 +1685,16 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) { - type = hlsl_new_type(ctx, hlsl_strdup(ctx, sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt; ctx->builtin_types.sampler[bt] = type; } - ctx->builtin_types.Void = hlsl_new_type(ctx, hlsl_strdup(ctx, "void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + ctx->builtin_types.Void = hlsl_new_type(ctx, "void", HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { - type = hlsl_new_type(ctx, hlsl_strdup(ctx, effect_types[i].name), effect_types[i].class, + type = hlsl_new_type(ctx, effect_types[i].name, effect_types[i].class, effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); hlsl_scope_add_type(ctx->globals, type); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Cache matrix types.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: ec8d8e6f73b9096e8f46433282ba266a21e57241 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec8d8e6f73b9096e8f46433… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:46 2021 -0500 vkd3d-shader/hlsl: Cache matrix types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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 | 3 ++- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 14ad90c..fc6d1e4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -200,7 +200,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } } -struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, +static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { struct hlsl_type *type; @@ -1658,6 +1658,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) sprintf(name, "%s%ux%u", names[bt], y, x); type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_MATRIX, bt, x, y); hlsl_scope_add_type(ctx->globals, type); + ctx->builtin_types.matrix[bt][x - 1][y - 1] = type; if (y == 1) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 7e62839..9686a49 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -459,6 +459,8 @@ struct hlsl_ctx { struct hlsl_type *scalar[HLSL_TYPE_LAST_SCALAR + 1]; struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; + /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ + struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4]; struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; struct hlsl_type *Void; } builtin_types; @@ -653,8 +655,6 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); -struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, - enum hlsl_base_type base_type, unsigned dimx, unsigned dimy); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5c10659..d1ef9eb 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1019,7 +1019,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return ctx->builtin_types.scalar[base]; if (type == HLSL_CLASS_VECTOR) return ctx->builtin_types.vector[base][dimx - 1]; - return hlsl_new_type(ctx, NULL, type, base, dimx, dimy); + return ctx->builtin_types.matrix[base][dimx - 1][dimy - 1]; } static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, @@ -2425,7 +2425,7 @@ type: YYABORT; } - $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); + $$ = ctx->builtin_types.matrix[$3->base_type][$7 - 1][$5 - 1]; } | KW_VOID {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use cached vector types in more places.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: b8502ed51cc6ab161e97214ba86c231a51eca6e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b8502ed51cc6ab161e97214… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:45 2021 -0500 vkd3d-shader/hlsl: Use cached vector types in more places. 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 932593f..14ad90c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -608,7 +608,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + ctx->builtin_types.vector[val->data_type->base_type][components - 1], *loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2a38470..5c10659 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2397,7 +2397,7 @@ type: YYABORT; } - $$ = hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + $$ = ctx->builtin_types.vector[$3->base_type][$5 - 1]; } | KW_MATRIX '<' type ',' C_INTEGER ',' C_INTEGER '>' {

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 October 2021