May 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winewayland: Stop using a recursive mutex for the window surfaces.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 3c21f175b84105d5f49a6fc81bbf3bf51614f9de URL: https://gitlab.winehq.org/wine/wine/-/commit/3c21f175b84105d5f49a6fc81bbf3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 winewayland: Stop using a recursive mutex for the window surfaces. --- dlls/winewayland.drv/window_surface.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 67cb2fe2d0b..cb5e1539072 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -507,7 +507,6 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect struct wayland_window_surface *wws; int width = rect->right - rect->left; int height = rect->bottom - rect->top; - pthread_mutexattr_t mutexattr; TRACE("hwnd %p rect %s\n", hwnd, wine_dbgstr_rect(rect)); @@ -522,10 +521,7 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect wws->info.bmiHeader.biPlanes = 1; wws->info.bmiHeader.biSizeImage = width * height * 4; - pthread_mutexattr_init(&mutexattr); - pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init(&wws->mutex, &mutexattr); - pthread_mutexattr_destroy(&mutexattr); + pthread_mutex_init(&wws->mutex, NULL); wws->header.funcs = &wayland_window_surface_funcs; wws->header.rect = *rect;

1 0

Rémi Bernon : winex11: Stop using a recursive mutex for the window surfaces.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 63ec330b3afef630ae9b82c60703af292a435c0c URL: https://gitlab.winehq.org/wine/wine/-/commit/63ec330b3afef630ae9b82c60703af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 winex11: Stop using a recursive mutex for the window surfaces. --- dlls/winex11.drv/bitblt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 94aa06773a7..5eccc4a2eb7 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1992,6 +1992,8 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) XDestroyImage( surface->image ); } if (surface->region) NtGdiDeleteObjectApp( surface->region ); + + pthread_mutex_destroy( &surface->mutex ); free( surface ); } @@ -2027,7 +2029,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface->info.bmiHeader.biSizeImage = get_dib_image_size( &surface->info ); if (format->bits_per_pixel > 8) set_color_info( vis, &surface->info, use_alpha ); - init_recursive_mutex( &surface->mutex ); + pthread_mutex_init( &surface->mutex, NULL ); surface->header.funcs = &x11drv_surface_funcs; surface->header.rect = *rect;

1 0

Krzysztof Bogacki : win32u: Use separate variable for inner loop.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: acea64b0ac12ad58583e81a32e6c481566d063fb URL: https://gitlab.winehq.org/wine/wine/-/commit/acea64b0ac12ad58583e81a32e6c48… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:10:20 2024 +0200 win32u: Use separate variable for inner loop. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/d3dkmt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c index b644135bfa1..5f3804c165d 100644 --- a/dlls/win32u/d3dkmt.c +++ b/dlls/win32u/d3dkmt.c @@ -563,7 +563,7 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE BOOL get_vulkan_gpus( struct list *gpus ) { VkPhysicalDevice *devices; - UINT i, count; + UINT i, j, count; if (!d3dkmt_use_vulkan()) return FALSE; if (!(count = get_vulkan_physical_devices( &devices ))) return FALSE; @@ -583,10 +583,10 @@ BOOL get_vulkan_gpus( struct list *gpus ) gpu->pci_id.device = properties2.properties.deviceID; pvkGetPhysicalDeviceMemoryProperties( devices[i], &mem_properties ); - for (i = 0; i < mem_properties.memoryHeapCount; i++) + for (j = 0; j < mem_properties.memoryHeapCount; j++) { - if (mem_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) - gpu->memory += mem_properties.memoryHeaps[i].size; + if (mem_properties.memoryHeaps[j].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->memory += mem_properties.memoryHeaps[j].size; } list_add_tail( gpus, &gpu->entry );

1 0

Krzysztof Bogacki : win32u: Log Vulkan GPU's PCI IDs when matching against them.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: e2aaba33a903c474834e0e59580cc24b47b5f0f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2aaba33a903c474834e0e59580cc2… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:27:58 2024 +0200 win32u: Log Vulkan GPU's PCI IDs when matching against them. We already have input GPU's PCI IDs logged by TRACE above; logging Vulkan GPU's IDs the second time is a bit inconsistent and misleading. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 54f514f557e..9d765545d26 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1235,14 +1235,16 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * if ((vulkan_gpu = find_vulkan_gpu_from_uuid( ctx, vulkan_uuid ))) TRACE( "Found vulkan GPU matching uuid %s, pci_id %#04x:%#04x, name %s\n", debugstr_guid(&vulkan_gpu->uuid), - pci_id->vendor, pci_id->device, debugstr_a(vulkan_gpu->name)); + vulkan_gpu->pci_id.vendor, vulkan_gpu->pci_id.device, debugstr_a(vulkan_gpu->name)); else if ((vulkan_gpu = find_vulkan_gpu_from_pci_id( ctx, pci_id ))) - TRACE( "Found vulkan GPU matching pci_id %#04x:%#04x, uuid %s, name %s\n", pci_id->vendor, pci_id->device, + TRACE( "Found vulkan GPU matching pci_id %#04x:%#04x, uuid %s, name %s\n", + vulkan_gpu->pci_id.vendor, vulkan_gpu->pci_id.device, debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); else if ((ptr = list_head( &ctx->vulkan_gpus ))) { vulkan_gpu = LIST_ENTRY( ptr, struct vulkan_gpu, entry ); - WARN( "Using vulkan GPU pci_id %#04x:%#04x, uuid %s, name %s\n", pci_id->vendor, pci_id->device, + WARN( "Using vulkan GPU pci_id %#04x:%#04x, uuid %s, name %s\n", + vulkan_gpu->pci_id.vendor, vulkan_gpu->pci_id.device, debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); }

1 0

Krzysztof Bogacki : win32u: Log Vulkan UUIDs when adding GPUs.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 3c211c6a07019cef9766e932b62a2d55632f23af URL: https://gitlab.winehq.org/wine/wine/-/commit/3c211c6a07019cef9766e932b62a2d… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:53:27 2024 +0200 win32u: Log Vulkan UUIDs when adding GPUs. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9d765545d26..3a22d8c73db 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1217,8 +1217,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * HKEY hkey, subkey; DWORD len; - TRACE( "%s %04X %04X %08X %02X\n", debugstr_a( name ), pci_id->vendor, pci_id->device, - pci_id->subsystem, pci_id->revision ); + TRACE( "%s %04X %04X %08X %02X %s\n", debugstr_a( name ), pci_id->vendor, pci_id->device, + pci_id->subsystem, pci_id->revision, debugstr_guid( vulkan_uuid ) ); if (!enum_key && !(enum_key = reg_create_ascii_key( NULL, enum_keyA, 0, NULL ))) return;

1 0

Krzysztof Bogacki : win32u: Remove unused variable from add_vulkan_only_gpus.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: 2a9db2a10c80df808d46735c8a4e7b8554bfb953 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a9db2a10c80df808d46735c8a4e7b… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:54:55 2024 +0200 win32u: Remove unused variable from add_vulkan_only_gpus. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3a22d8c73db..26ed8b1d1ac 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1996,7 +1996,6 @@ static UINT update_display_devices( struct device_manager_ctx *ctx ) static void add_vulkan_only_gpus( struct device_manager_ctx *ctx ) { - struct list gpus = LIST_INIT(gpus); struct vulkan_gpu *gpu, *next; LIST_FOR_EACH_ENTRY_SAFE( gpu, next, &ctx->vulkan_gpus, struct vulkan_gpu, entry )

1 0

Nikolay Sivov : vkd3d-shader/ir: Set texture register dimension as VEC4 when normalising combined samplers.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 308d735923288e04a7ad418fbd201aa749c112aa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/308d735923288e04a7ad418fbd201… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 12:58:39 2024 +0200 vkd3d-shader/ir: Set texture register dimension as VEC4 when normalising combined samplers. Thanks, Giovanni. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/ir.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 37818d4d..b3b745fc 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1886,6 +1886,7 @@ static enum vkd3d_result vsir_program_normalise_combined_samplers(struct vsir_pr srcs[1].reg.idx[1] = ins->src[1].reg.idx[0]; srcs[1].reg.idx_count = 2; srcs[1].reg.data_type = VKD3D_DATA_RESOURCE; + srcs[1].reg.dimension = VSIR_DIMENSION_VEC4; srcs[1].swizzle = VKD3D_SHADER_NO_SWIZZLE; srcs[2].reg.type = VKD3DSPR_SAMPLER;

1 0

Henri Verbeet : include: Document the additional HLSL transformations supported by vkd3d_shader_compile().
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 007233a016082ce0ef6ad39c89e29a91c77b0148 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/007233a016082ce0ef6ad39c89e29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 24 23:04:13 2024 +0200 include: Document the additional HLSL transformations supported by vkd3d_shader_compile(). --- include/vkd3d_shader.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b32b8a3..082f3417 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -2059,8 +2059,12 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_SPIRV_TEXT * (if vkd3d was compiled with SPIRV-Tools) * - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_D3D_ASM - * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_SPIRV_BINARY + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_SPIRV_TEXT + * (if vkd3d was compiled with SPIRV-Tools) + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_ASM * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_BYTECODE + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_FX * * Supported transformations can also be detected at runtime with the functions

1 0

Henri Verbeet : include: Add a \since tag for VKD3D_FALSE.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: b363fdbb21188b740f6289c86121021deaf8810f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b363fdbb21188b740f6289c861210… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 12:27:12 2024 +0200 include: Add a \since tag for VKD3D_FALSE. --- include/vkd3d_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 420dd787..706fa7ed 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -41,7 +41,7 @@ enum vkd3d_result { /** Success. */ VKD3D_OK = 0, - /** Success as a result of there being nothing to do. */ + /** Success as a result of there being nothing to do. \since 1.12 */ VKD3D_FALSE = 1, /** An unspecified failure occurred. */ VKD3D_ERROR = -1,

1 0

Henri Verbeet : build: Fix the order of a couple of shader runner tests.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 695ef722e8cfd8ddf34dbd1d5f2fee776f2e2a60 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/695ef722e8cfd8ddf34dbd1d5f2fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 24 23:07:01 2024 +0200 build: Fix the order of a couple of shader runner tests. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index b3288b50..544e6a90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,8 +135,8 @@ vkd3d_shader_tests = \ tests/hlsl/initializer-objects.shader_test \ tests/hlsl/initializer-static-array.shader_test \ tests/hlsl/initializer-struct.shader_test \ - tests/hlsl/intrinsic-override.shader_test \ tests/hlsl/instance-id.shader_test \ + tests/hlsl/intrinsic-override.shader_test \ tests/hlsl/invalid.shader_test \ tests/hlsl/inverse-trig.shader_test \ tests/hlsl/is-front-face.shader_test \ @@ -194,8 +194,8 @@ vkd3d_shader_tests = \ tests/hlsl/side-effects.shader_test \ tests/hlsl/sign.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \ - tests/hlsl/sm1-const-folding.shader_test \ tests/hlsl/sm1-const-allocation.shader_test \ + tests/hlsl/sm1-const-folding.shader_test \ tests/hlsl/sm6-ternary.shader_test \ tests/hlsl/sm6-uav-rwtexture.shader_test \ tests/hlsl/smoothstep.shader_test \

1 0