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

Rémi Bernon : win32u: Flush window surface when it is fully unlocked.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: ec700bb712c0bf3b051333754c8faf0f9b4de1ad URL: https://gitlab.winehq.org/wine/wine/-/commit/ec700bb712c0bf3b051333754c8faf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 4 17:10:08 2024 +0100 win32u: Flush window surface when it is fully unlocked. --- dlls/win32u/dibdrv/dc.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 38039e7d6ae..e1b2f66cb25 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -734,6 +734,7 @@ struct windrv_physdev struct gdi_physdev dev; struct dibdrv_physdev *dibdrv; struct window_surface *surface; + UINT lock_count; }; static const struct gdi_dc_funcs window_driver; @@ -743,25 +744,34 @@ static inline struct windrv_physdev *get_windrv_physdev( PHYSDEV dev ) return (struct windrv_physdev *)dev; } +/* gdi_lock should not be locked */ static inline void lock_surface( struct windrv_physdev *dev ) { - /* gdi_lock should not be locked */ - dev->surface->funcs->lock( dev->surface ); - if (IsRectEmpty( dev->dibdrv->bounds ) || dev->surface->draw_start_ticks == 0) - dev->surface->draw_start_ticks = NtGetTickCount(); + struct window_surface *surface = dev->surface; + + surface->funcs->lock( surface ); + if (!dev->lock_count++) + { + if (IsRectEmpty( dev->dibdrv->bounds ) || !surface->draw_start_ticks) + surface->draw_start_ticks = NtGetTickCount(); + } } static inline void unlock_surface( struct windrv_physdev *dev ) { - BOOL should_flush = NtGetTickCount() - dev->surface->draw_start_ticks > FLUSH_PERIOD; - dev->surface->funcs->unlock( dev->surface ); - if (should_flush) dev->surface->funcs->flush( dev->surface ); + struct window_surface *surface = dev->surface; + + surface->funcs->unlock( surface ); + if (!--dev->lock_count) + { + DWORD ticks = NtGetTickCount() - surface->draw_start_ticks; + if (ticks > FLUSH_PERIOD) surface->funcs->flush( dev->surface ); + } } -static void unlock_bits_surface( struct gdi_image_bits *bits ) +static void unlock_windrv_bits( struct gdi_image_bits *bits ) { - struct window_surface *surface = bits->param; - surface->funcs->unlock( surface ); + unlock_surface( bits->param ); } void dibdrv_set_window_surface( DC *dc, struct window_surface *surface ) @@ -964,8 +974,8 @@ static DWORD windrv_GetImage( PHYSDEV dev, BITMAPINFO *info, { /* use the freeing callback to unlock the surface */ assert( !bits->free ); - bits->free = unlock_bits_surface; - bits->param = physdev->surface; + bits->free = unlock_windrv_bits; + bits->param = physdev; } else unlock_surface( physdev ); return ret;

1 0

Rémi Bernon : wineandroid: Fix NtUserSendHardwareInput parameter order.
by Alexandre Julliard May 28, 2024

May 28, 2024

Module: wine Branch: master Commit: e9ec634b62fe485f0413ccdee3444750ac5c283e URL: https://gitlab.winehq.org/wine/wine/-/commit/e9ec634b62fe485f0413ccdee34447… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 25 18:45:59 2024 +0200 wineandroid: Fix NtUserSendHardwareInput parameter order. --- dlls/wineandroid.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 3e900aa6f4d..1f998c0b2ae 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -514,7 +514,7 @@ static int process_events( DWORD mask ) } SERVER_END_REQ; } - NtUserSendHardwareInput( capture ? capture : event->data.motion.hwnd, &event->data.motion.input, 0, 0 ); + NtUserSendHardwareInput( capture ? capture : event->data.motion.hwnd, 0, &event->data.motion.input, 0 ); } break;

1 0

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

May 28, 2024

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 May 28, 2024

May 28, 2024

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

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

May 28, 2024

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: Use separate variable for inner loop.
by Alexandre Julliard May 28, 2024

May 28, 2024

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

Henri Verbeet : tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: vkd3d Branch: master Commit: 9693271dcfb96e9cd8d44c181cf70044edbf6861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9693271dcfb96e9cd8d44c181cf70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 20:13:53 2024 +0200 tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC. For consistency with the other VKD3D_TEST_* environment variables. --- README | 3 +++ gitlab/test.yml | 4 ++-- tests/shader_runner.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README b/README index 5cb8ebb3..27da28b7 100644 --- a/README +++ b/README @@ -86,6 +86,9 @@ commas or semicolons. platform controls the behavior of todo(), todo_if(), bug_if() and broken() conditions in tests. + * VKD3D_TEST_SKIP_DXC - when set, tests requiring the dxcompiler library will + be skipped. + * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests. If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader diff --git a/gitlab/test.yml b/gitlab/test.yml index da01425f..2e8ee834 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -19,13 +19,13 @@ test-win-64: extends: .test-win variables: TEST_ARCH: "64" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-32: extends: .test-win variables: TEST_ARCH: "32" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-64-dxc: stage: test diff --git a/tests/shader_runner.c b/tests/shader_runner.c index e91db918..c2fc30d1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2158,7 +2158,7 @@ static IDxcCompiler3 *dxcompiler_create(void) HRESULT hr; void *dll; - if ((skip_dxc = getenv("VKD3D_TESTS_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) + if ((skip_dxc = getenv("VKD3D_TEST_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) return NULL; #ifdef VKD3D_CROSSTEST

1 0

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

May 27, 2024

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

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

May 27, 2024

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 : include: Document the additional HLSL transformations supported by vkd3d_shader_compile().
by Alexandre Julliard May 27, 2024

May 27, 2024

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