- Wine-Commits - list.winehq.org

Alexandre Julliard : kernelbase: Update timezone data to version 2023c.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 58bc99dce6ce30a9a343ba2532ebe6f2d8e04a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/58bc99dce6ce30a9a343ba2532ebe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 4 14:34:34 2023 +0200 kernelbase: Update timezone data to version 2023c. --- dlls/kernelbase/kernelbase.rgs | 38 ++++++++++++++++++++++++++------------ tools/make_unicode | 4 ++-- 2 files changed, 28 insertions(+), 14 deletions(-)

1 0

Alexandre Julliard : nls: Update locale data to CLDR version 43.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 50c5eb31cbcbfc2c158c1b2f9d00513676ee8b28 URL: https://gitlab.winehq.org/wine/wine/-/commit/50c5eb31cbcbfc2c158c1b2f9d0051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 4 18:26:01 2023 +0200 nls: Update locale data to CLDR version 43. --- nls/locale.nls | Bin 742598 -> 745142 bytes tools/make_unicode | 158 ++++++++++++++++++++++++++--------------------------- 2 files changed, 79 insertions(+), 79 deletions(-)

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.38.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: wine Branch: master Commit: 6b678a4e9b7bf0fcbdfbe49d75fa8911807fe9d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b678a4e9b7bf0fcbdfbe49d75fa89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:09:29 2023 +0200 xslt: Import upstream release 1.1.38. --- libs/xslt/libxslt/attributes.c | 19 +- libs/xslt/libxslt/attributes.h | 1 + libs/xslt/libxslt/attrvt.c | 33 ++-- libs/xslt/libxslt/documents.c | 2 + libs/xslt/libxslt/extensions.c | 16 +- libs/xslt/libxslt/functions.c | 145 +++++++++++--- libs/xslt/libxslt/imports.c | 60 +++--- libs/xslt/libxslt/keys.c | 26 +-- libs/xslt/libxslt/numbers.c | 96 ++++++---- libs/xslt/libxslt/pattern.c | 92 +++------ libs/xslt/libxslt/preproc.c | 10 - libs/xslt/libxslt/templates.c | 4 +- libs/xslt/libxslt/transform.c | 117 ++++++++---- libs/xslt/libxslt/variables.c | 96 +++++----- libs/xslt/libxslt/variables.h | 6 +- libs/xslt/libxslt/xslt.c | 91 ++++----- libs/xslt/libxslt/xsltInternals.h | 18 +- libs/xslt/libxslt/xsltconfig.h | 6 +- libs/xslt/libxslt/xsltlocale.c | 150 +++++++++------ libs/xslt/libxslt/xsltlocale.h | 68 ++----- libs/xslt/libxslt/xsltutils.c | 386 +++++++++++++++++++++++++++++--------- libs/xslt/libxslt/xsltutils.h | 37 +++- 22 files changed, 927 insertions(+), 552 deletions(-)

1 0

Alexandre Julliard : xml2: Import upstream release 2.11.4.
by Alexandre Julliard June 5, 2023

June 5, 2023

1 0

Nikolay Sivov : vkd3d-shader/d3d-asm: Fix 3D sampler declaration instruction name.
by Alexandre Julliard June 5, 2023

June 5, 2023

Module: vkd3d Branch: master Commit: ccad49d486fa44f5e0767fa7733a1a3927d3bd94 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ccad49d486fa44f5e0767fa7733a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 12:42:52 2023 +0200 vkd3d-shader/d3d-asm: Fix 3D sampler declaration instruction name. --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 3357b450..0a821b5c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -646,7 +646,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "_3d"); + shader_addline(buffer, "_volume"); break; case VKD3D_SHADER_RESOURCE_TEXTURE_CUBE:

1 0

Giovanni Mascellani : dxgi: Move Vulkan-specific code to d3d12_swapchain_create_vulkan_swapchain().
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 4e88f44270e57e6536134c3323645733b71dcac0 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e88f44270e57e6536134c33236457… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 15:16:13 2023 +0200 dxgi: Move Vulkan-specific code to d3d12_swapchain_create_vulkan_swapchain(). --- dlls/dxgi/swapchain.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1d86e79d5e5..0b8d09d8b96 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1558,32 +1558,10 @@ static HRESULT d3d12_swapchain_create_image_resources(struct d3d12_swapchain *sw static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) { - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; ID3D12CommandQueue *queue = swapchain->command_queue; - VkDevice vk_device = swapchain->vk_device; - uint32_t image_count, queue_family_index; - VkResult vr; + uint32_t queue_family_index; HRESULT hr; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) - { - FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); - return E_FAIL; - } - swapchain->buffer_count = image_count; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, - &image_count, swapchain->vk_swapchain_images)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) @@ -1772,6 +1750,24 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s if (swapchain->vk_swapchain) vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (image_count > ARRAY_SIZE(swapchain->vk_swapchain_images)) + { + FIXME("Unsupported Vulkan swapchain image count %u.\n", image_count); + return E_FAIL; + } + swapchain->buffer_count = image_count; + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, + &image_count, swapchain->vk_swapchain_images)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + swapchain->vk_swapchain = vk_swapchain; swapchain->vk_swapchain_width = width; swapchain->vk_swapchain_height = height;

1 0

Giovanni Mascellani : dxgi: Move non-Vulkan-specific code out of d3d12_swapchain_create_vulkan_swapchain().
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: a7ff40a3248a5c6aa3d5b6f6d3be97e36ea78a17 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7ff40a3248a5c6aa3d5b6f6d3be97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 15:02:00 2023 +0200 dxgi: Move non-Vulkan-specific code out of d3d12_swapchain_create_vulkan_swapchain(). --- dlls/dxgi/swapchain.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index deb7e50026d..1d86e79d5e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1687,12 +1687,6 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s VkResult vr; HRESULT hr; - if (!(swapchain->vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) - { - WARN("Invalid format %#x.\n", swapchain->desc.Format); - return DXGI_ERROR_INVALID_CALL; - } - if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, swapchain->vk_surface, &swapchain->desc, &vk_swapchain_format))) return hr; @@ -1784,6 +1778,22 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; + return S_OK; +} + +static HRESULT d3d12_swapchain_create_resources(struct d3d12_swapchain *swapchain) +{ + HRESULT hr; + + if (!(swapchain->vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) + { + WARN("Invalid format %#x.\n", swapchain->desc.Format); + return DXGI_ERROR_INVALID_CALL; + } + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + return hr; + return d3d12_swapchain_create_buffers(swapchain); } @@ -1970,7 +1980,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha d3d12_swapchain_destroy_buffers(swapchain, FALSE); swapchain->present_mode = present_mode; - return d3d12_swapchain_create_vulkan_swapchain(swapchain); + return d3d12_swapchain_create_resources(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2077,7 +2087,7 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + if (FAILED(hr = d3d12_swapchain_create_resources(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2356,7 +2366,7 @@ static HRESULT d3d12_swapchain_resize_buffers(struct d3d12_swapchain *swapchain, d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; - return d3d12_swapchain_create_vulkan_swapchain(swapchain); + return d3d12_swapchain_create_resources(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain4 *iface, @@ -3038,7 +3048,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); ID3D12Device_AddRef(swapchain->device = device); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + if (FAILED(hr = d3d12_swapchain_create_resources(swapchain))) { d3d12_swapchain_destroy(swapchain); return hr;

1 0

Giovanni Mascellani : dxgi: Rename d3d12_swapchain_prepare_command_buffers().
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 565917d5d253067ac1c70a7235c01dad6ac08fac URL: https://gitlab.winehq.org/wine/wine/-/commit/565917d5d253067ac1c70a7235c01d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 14:18:58 2023 +0200 dxgi: Rename d3d12_swapchain_prepare_command_buffers(). --- dlls/dxgi/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index aabbb9943c3..4aa0066cf32 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1454,7 +1454,7 @@ static VkResult d3d12_swapchain_record_swapchain_blit(struct d3d12_swapchain *sw return vr; } -static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, +static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *swapchain, uint32_t queue_family_index) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1548,7 +1548,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr; - if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, queue_family_index))) + if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) return hr; if (swapchain->buffers[0])

1 0

Giovanni Mascellani : dxgi: Document some struct d3d12_swapchain fields.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: eec9c3a2f63555604dd6e357bb3280e82e14ff5b URL: https://gitlab.winehq.org/wine/wine/-/commit/eec9c3a2f63555604dd6e357bb3280… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 30 14:41:39 2023 +0200 dxgi: Document some struct d3d12_swapchain fields. --- dlls/dxgi/swapchain.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0ba9db96108..aabbb9943c3 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1044,26 +1044,37 @@ struct d3d12_swapchain struct wined3d_swapchain_state *state; struct wined3d_swapchain_state_parent state_parent; - VkSwapchainKHR vk_swapchain; VkSurfaceKHR vk_surface; VkFence vk_fence; VkInstance vk_instance; VkDevice vk_device; VkPhysicalDevice vk_physical_device; + + /* D3D12 side of the swapchain: these objects are visible to the + * IDXGISwapChain client, so they must never be recreated, except + * when ResizeBuffers*() is called. */ + unsigned int buffer_count; VkDeviceMemory vk_memory; - VkCommandPool vk_cmd_pool; VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + unsigned int current_buffer_index; + + /* Vulkan side of the swapchain: these objects are also destroyed + * and recreated when the Vulkan swapchain becomes out of date or + * when the synchronization interval is changed; this operation + * should be transparent to the IDXGISwapChain client (except for + * timings: recreating the Vulkan swapchain creates a noticeable + * delay, unfortunately). */ + VkSwapchainKHR vk_swapchain; + VkCommandPool vk_cmd_pool; VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkCommandBuffer vk_cmd_buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; - ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; - unsigned int buffer_count; unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; VkPresentModeKHR present_mode; - uint32_t vk_image_index; - unsigned int current_buffer_index; + struct dxgi_vk_funcs vk_funcs; ID3D12CommandQueue *command_queue;

1 0

Giovanni Mascellani : dxgi: Store Vulkan formats in the swapchain object.
by Alexandre Julliard June 2, 2023

June 2, 2023

Module: wine Branch: master Commit: 237062d01feaeaf614ffb353f6736b7aa72ea36a URL: https://gitlab.winehq.org/wine/wine/-/commit/237062d01feaeaf614ffb353f6736b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 19 14:46:58 2023 +0200 dxgi: Store Vulkan formats in the swapchain object. --- dlls/dxgi/swapchain.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4aa0066cf32..7d368c88687 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1073,6 +1073,8 @@ struct d3d12_swapchain unsigned int vk_swapchain_width; unsigned int vk_swapchain_height; VkPresentModeKHR present_mode; + VkFormat vk_format; + uint32_t vk_image_index; struct dxgi_vk_funcs vk_funcs; @@ -1255,7 +1257,7 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } -static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) +static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDeviceSize image_offset[DXGI_MAX_SWAP_CHAIN_BUFFERS]; @@ -1276,7 +1278,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; image_info.imageType = VK_IMAGE_TYPE_2D; - image_info.format = vk_format; + image_info.format = swapchain->vk_format; image_info.extent.width = swapchain->desc.Width; image_info.extent.height = swapchain->desc.Height; image_info.extent.depth = 1; @@ -1511,8 +1513,7 @@ static HRESULT d3d12_swapchain_create_command_buffers(struct d3d12_swapchain *sw return S_OK; } -static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, - VkFormat vk_swapchain_format, VkFormat vk_format) +static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; struct vkd3d_image_resource_create_info resource_info; @@ -1545,7 +1546,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, queue_family_index = vkd3d_get_vk_queue_family_index(queue); - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain))) return hr; if (FAILED(hr = d3d12_swapchain_create_command_buffers(swapchain, queue_family_index))) @@ -1562,7 +1563,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Height = swapchain->desc.Height; resource_info.desc.DepthOrArraySize = 1; resource_info.desc.MipLevels = 1; - resource_info.desc.Format = dxgi_format_from_vk_format(vk_format); + resource_info.desc.Format = dxgi_format_from_vk_format(swapchain->vk_format); resource_info.desc.SampleDesc.Count = 1; resource_info.desc.SampleDesc.Quality = 0; resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; @@ -1671,15 +1672,15 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkSwapchainCreateInfoKHR vk_swapchain_desc; VkDevice vk_device = swapchain->vk_device; - VkFormat vk_format, vk_swapchain_format; unsigned int width, height, image_count; VkSurfaceCapabilitiesKHR surface_caps; + VkFormat vk_swapchain_format; VkSwapchainKHR vk_swapchain; VkImageUsageFlags usage; VkResult vr; HRESULT hr; - if (!(vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) + if (!(swapchain->vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) { WARN("Invalid format %#x.\n", swapchain->desc.Format); return DXGI_ERROR_INVALID_CALL; @@ -1776,7 +1777,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_image_index = INVALID_VK_IMAGE_INDEX; - return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); + return d3d12_swapchain_create_buffers(swapchain); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain4(IDXGISwapChain4 *iface)

1 0