wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Józef Kucia : vkd3d: Remember the last fence we waited for.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 58e0a89d7695e5c5518f333678a13a1de14edf93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=58e0a89d7695e5c5518f333… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:20 2019 +0200 vkd3d: Remember the last fence we waited for. An application uses the following pattern: Wait(queue, fence, value); ExecuteCommandLists(queue, count, lists); Wait(queue, fence, value); ExecuteCommandLists(queue, count2, lists2); In this case, we don't need to wait for the fence again. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 41 ++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 3 +++ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 07de716..606c5bb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5471,11 +5471,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_signaled_semaphore *semaphore; - VkQueue vk_queue = VK_NULL_HANDLE; uint64_t completed_value = 0; struct vkd3d_queue *queue; struct d3d12_fence *fence; VkSubmitInfo submit_info; + VkQueue vk_queue; VkResult vr; HRESULT hr; @@ -5486,18 +5486,34 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if fence = unsafe_impl_from_ID3D12Fence(fence_iface); - if (!(semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value))) + semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value); + if (!semaphore && completed_value >= value) + { + /* We don't get a Vulkan semaphore if the fence was signaled on CPU. */ + TRACE("Already signaled %p, value %#"PRIx64".\n", fence, completed_value); + return S_OK; + } + + if (!(vk_queue = vkd3d_queue_acquire(queue))) + { + ERR("Failed to acquire queue %p.\n", queue); + hr = E_FAIL; + goto fail; + } + + if (!semaphore) { - if (completed_value >= value) + if (command_queue->last_waited_fence == fence && command_queue->last_waited_fence_value >= value) { - TRACE("Already signaled %p, value %#"PRIx64".\n", fence, completed_value); + WARN("Already waited on fence %p, value %#"PRIx64".\n", fence, value); } else { - FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64", completed value %#"PRIx64".\n", - fence, value, completed_value); + FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64 + ", completed value %#"PRIx64".\n", fence, value, completed_value); } + vkd3d_queue_release(queue); return S_OK; } @@ -5511,13 +5527,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if submit_info.signalSemaphoreCount = 0; submit_info.pSignalSemaphores = NULL; - if (!(vk_queue = vkd3d_queue_acquire(queue))) - { - ERR("Failed to acquire queue %p.\n", queue); - hr = E_FAIL; - goto fail; - } - if (!vkd3d_array_reserve((void **)&queue->semaphores, &queue->semaphores_size, queue->semaphore_count + 1, sizeof(*queue->semaphores))) { @@ -5532,6 +5541,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if queue->semaphores[queue->semaphore_count].vk_semaphore = semaphore->vk_semaphore; queue->semaphores[queue->semaphore_count].sequence_number = queue->submitted_sequence_number + 1; ++queue->semaphore_count; + + command_queue->last_waited_fence = fence; + command_queue->last_waited_fence_value = value; } vkd3d_queue_release(queue); @@ -5632,6 +5644,9 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (!(queue->vkd3d_queue = d3d12_device_get_vkd3d_queue(device, desc->Type))) return E_NOTIMPL; + queue->last_waited_fence = NULL; + queue->last_waited_fence_value = 0; + if (desc->Priority == D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME) { FIXME("Global realtime priority is not implemented.\n"); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b5beffa..402ac0a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -924,6 +924,9 @@ struct d3d12_command_queue struct vkd3d_queue *vkd3d_queue; + const struct d3d12_fence *last_waited_fence; + uint64_t last_waited_fence_value; + struct d3d12_device *device; struct vkd3d_private_store private_store;

1 0

Józef Kucia : tests: Add test for UNKNOWN RTV formats in pipeline state desc.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 56cd52dad1ef5ad09c1af85fadfc5f9600a6c892 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56cd52dad1ef5ad09c1af85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:19 2019 +0200 tests: Add test for UNKNOWN RTV formats in pipeline state desc. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c1992a8..4e08636 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4740,6 +4740,105 @@ static void test_multiple_render_targets(void) destroy_test_context(&context); } +static void test_unknown_rtv_format(void) +{ + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_CPU_DESCRIPTOR_HANDLE rtvs[3]; + ID3D12Resource *render_targets[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(out float4 target1 : SV_Target1, out float4 target2 : SV_Target2) + { + target1 = float4(2.0f, 0.0f, 0.0f, 1.0f); + target2 = float4(3.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x980554be, 0xb8743fb0, 0xf5bb8deb, 0x639feaf8, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, + 0x0000000f, 0x00000038, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, 0x001020f2, + 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, + 0x40000000, 0x00000000, 0x00000000, 0x3f800000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, + 0x40400000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_descriptor_count = 16; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); + pso_desc.NumRenderTargets = ARRAY_SIZE(rtvs); + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + pso_desc.RTVFormats[i] = desc.rt_format; + pso_desc.RTVFormats[0] = DXGI_FORMAT_UNKNOWN; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + rtvs[0] = get_cpu_rtv_handle(&context, context.rtv_heap, 0); + rtvs[1] = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + rtvs[2] = get_cpu_rtv_handle(&context, context.rtv_heap, 2); + create_render_target(&context, &desc, &render_targets[0], &rtvs[1]); + create_render_target(&context, &desc, &render_targets[1], &rtvs[2]); + + for (i = 0; i < ARRAY_SIZE(rtvs); ++i) + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtvs[i], &white.x, 0, NULL); + + /* NULL RTV */ + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2D; + rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + rtv_desc.Texture2D.MipSlice = 0; + rtv_desc.Texture2D.PlaneSlice = 0; + ID3D12Device_CreateRenderTargetView(context.device, NULL, &rtv_desc, + get_cpu_rtv_handle(&context, context.rtv_heap, 0)); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, render_targets[0], + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, render_targets[1], + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &white, 0); + reset_command_list(command_list, context.allocator); + expected_vec4.x = 2.0f; + check_sub_resource_vec4(render_targets[0], 0, queue, command_list, &expected_vec4, 0); + reset_command_list(command_list, context.allocator); + expected_vec4.x = 3.0f; + check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0); + + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) + ID3D12Resource_Release(render_targets[i]); + destroy_test_context(&context); +} + static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; @@ -29003,6 +29102,7 @@ START_TEST(d3d12) run_test(test_draw_indexed_instanced); run_test(test_draw_no_descriptor_bindings); run_test(test_multiple_render_targets); + run_test(test_unknown_rtv_format); run_test(test_append_aligned_element); run_test(test_gpu_virtual_address); run_test(test_fragment_coords);

1 0

Józef Kucia : vkd3d: Accept DXGI_FORMAT_UNKNOWN for pipeline RTV formats.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 8e16831549fe65fb640cf5706f28e4a07d8b4575 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e16831549fe65fb640cf57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:18 2019 +0200 vkd3d: Accept DXGI_FORMAT_UNKNOWN for pipeline RTV formats. A NULL RTV is expected to be used when RTVFormat is DXGI_FORMAT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 26 +++++++++++++++++----- libs/vkd3d/state.c | 55 ++++++++++++++++++++++++++++++---------------- libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 57 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index abe4f27..07de716 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2331,8 +2331,11 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l { struct d3d12_device *device = list->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + struct d3d12_graphics_pipeline_state *graphics; struct VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; + unsigned int view_count; size_t start_idx = 0; unsigned int i; VkResult vr; @@ -2340,24 +2343,35 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l if (list->current_framebuffer != VK_NULL_HANDLE) return true; - if (!list->state->u.graphics.rt_idx) + graphics = &list->state->u.graphics; + + if (!graphics->rt_idx) ++start_idx; - for (i = 0; i < list->state->u.graphics.attachment_count; ++i) + for (i = 0, view_count = 0; i < graphics->attachment_count; ++i) { + if (graphics->null_attachment_mask & (1u << i)) + { + if (list->views[start_idx + i]) + WARN("Expected NULL view for attachment %u.\n", i); + continue; + } + if (!list->views[start_idx + i]) { - FIXME("Invalid attachment %u.\n", i); + FIXME("Invalid view for attachment %u.\n", i); return false; } + + views[view_count++] = list->views[start_idx + i]; } fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; - fb_desc.renderPass = list->state->u.graphics.render_pass; - fb_desc.attachmentCount = list->state->u.graphics.attachment_count; - fb_desc.pAttachments = &list->views[start_idx]; + fb_desc.renderPass = graphics->render_pass; + fb_desc.attachmentCount = view_count; + fb_desc.pAttachments = views; d3d12_command_list_get_fb_extent(list, &fb_desc.width, &fb_desc.height, &fb_desc.layers); if ((vr = VK_CALL(vkCreateFramebuffer(device->vk_device, &fb_desc, NULL, &vk_framebuffer))) < 0) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2b7059c..bc59b01 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1049,11 +1049,11 @@ static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pa VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_render_pass_entry *entry; + unsigned int index, attachment_index; unsigned int color_attachment_index; VkSubpassDescription sub_pass_desc; VkRenderPassCreateInfo pass_info; bool have_depth_stencil; - unsigned int index; VkResult vr; if (!vkd3d_array_reserve((void **)&cache->render_passes, &cache->render_passes_size, @@ -1104,28 +1104,37 @@ static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pa attachments[index].initialLayout = depth_layout; attachments[index].finalLayout = depth_layout; - attachment_references[index].attachment = 0; + attachment_references[index].attachment = index; attachment_references[index].layout = depth_layout; ++index; } + attachment_index = index; assert(index == color_attachment_index); for (; index < key->attachment_count; ++index) { + if (!key->vk_formats[index]) + { + attachment_references[index].attachment = VK_ATTACHMENT_UNUSED; + attachment_references[index].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + continue; + } - attachments[index].flags = 0; - attachments[index].format = key->vk_formats[index]; - attachments[index].samples = key->sample_count; - attachments[index].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - attachments[index].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - attachments[index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - attachments[index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - attachments[index].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - attachments[index].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - attachment_references[index].attachment = index; + attachments[attachment_index].flags = 0; + attachments[attachment_index].format = key->vk_formats[index]; + attachments[attachment_index].samples = key->sample_count; + attachments[attachment_index].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachments[attachment_index].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + attachments[attachment_index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachments[attachment_index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + attachments[attachment_index].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + attachments[attachment_index].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + attachment_references[index].attachment = attachment_index; attachment_references[index].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + ++attachment_index; } sub_pass_desc.flags = 0; @@ -1145,7 +1154,7 @@ static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pa pass_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; pass_info.pNext = NULL; pass_info.flags = 0; - pass_info.attachmentCount = key->attachment_count; + pass_info.attachmentCount = attachment_index; pass_info.pAttachments = attachments; pass_info.subpassCount = 1; pass_info.pSubpasses = &sub_pass_desc; @@ -2140,6 +2149,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s FIXME("DSV format is DXGI_FORMAT_UNKNOWN, disabling depth/stencil tests.\n"); graphics->rt_idx = 0; + graphics->null_attachment_mask = 0; if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { @@ -2183,7 +2193,18 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; size_t idx = graphics->rt_idx + i; - if (!(format = vkd3d_get_format(device, desc->RTVFormats[i], false))) + if (desc->RTVFormats[i] == DXGI_FORMAT_UNKNOWN) + { + graphics->null_attachment_mask |= 1u << idx; + ps_output_swizzle[i] = VKD3D_NO_SWIZZLE; + render_pass_key.vk_formats[idx] = VK_FORMAT_UNDEFINED; + } + else if ((format = vkd3d_get_format(device, desc->RTVFormats[i], false))) + { + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); + render_pass_key.vk_formats[idx] = format->vk_format; + } + else { WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; @@ -2204,10 +2225,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); - - render_pass_key.vk_formats[idx] = format->vk_format; - blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 057a0a7..b5beffa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -675,6 +675,7 @@ struct d3d12_graphics_pipeline_state VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; unsigned int attachment_count, rt_idx; + unsigned int null_attachment_mask; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value;

1 0

Alexandre Julliard : Wine release 4.8
by Alexandre Julliard 10 May '19

10 May '19

Module: website Branch: master Commit: ede4560ec78110a9497ef78d13ec8768ae424935 URL: https://source.winehq.org/git/website.git/?a=commit;h=ede4560ec78110a9497ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 17:45:31 2019 +0200 Wine release 4.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019051001.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2019051001.xml b/news/en/2019051001.xml new file mode 100644 index 0000000..aeb0b95 --- /dev/null +++ b/news/en/2019051001.xml @@ -0,0 +1,18 @@ +<news> +<date>May 10, 2019</date> +<title>Wine 4.8 Released</title> +<body> + The Wine development release 4.8 is now available. + <a href="{$root}/announce/4.8">What's new</a> in this release: +<ul> + <li>Support building most programs in PE format.</li> + <li>Unicode data updated to Unicode 12.0.</li> + <li>Support for MSI patch files.</li> + <li>Default to non-PIC builds on i386.</li> + <li>Joystick support improvements.</li> + <li>Asturian locale.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.8 : Alexandre Julliard : Release 4.8
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: refs/tags/wine-4.8 Tag: 1055ea4144db7bb51c4d34479f7da3ff5c4e5e37 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1055ea4144db7bb51c4d34479f7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 17:43:42 2019 +0200 Release 4.8

1 0

Alexandre Julliard : Release 4.8.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: aaf9c833ee1b9dca8cffcb2a60c96093fdd36405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf9c833ee1b9dca8cffcb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 17:43:42 2019 +0200 Release 4.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 800 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 441 insertions(+), 383 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf9c833ee1b9dca8cff…

1 0

Vincent Povirk : windowscodecs: Treat 16-bit channels as little endian.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: 2b7b3abc5b334ec8b17dc98a25eefd26e1d0054d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b7b3abc5b334ec8b17dc98a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 9 15:30:43 2019 -0500 windowscodecs: Treat 16-bit channels as little endian. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 17 +++++++++-------- dlls/windowscodecs/tests/converter.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 72cbf1f..0d7a3b7 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -458,8 +458,9 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { + srcbyte++; *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; - srcbyte+=2; + srcbyte++; } srcrow += srcstride; dstrow += cbStride; @@ -776,9 +777,9 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { BYTE red, green, blue; - red = *srcpixel++; srcpixel++; - green = *srcpixel++; srcpixel++; - blue = *srcpixel++; srcpixel++; + srcpixel++; red = *srcpixel++; + srcpixel++; green = *srcpixel++; + srcpixel++; blue = *srcpixel++; *dstpixel++=0xff000000|red<<16|green<<8|blue; } srcrow += srcstride; @@ -820,10 +821,10 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { BYTE red, green, blue, alpha; - red = *srcpixel++; srcpixel++; - green = *srcpixel++; srcpixel++; - blue = *srcpixel++; srcpixel++; - alpha = *srcpixel++; srcpixel++; + srcpixel++; red = *srcpixel++; + srcpixel++; green = *srcpixel++; + srcpixel++; blue = *srcpixel++; + srcpixel++; alpha = *srcpixel++; *dstpixel++=alpha<<24|red<<16|green<<8|blue; } srcrow += srcstride; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index b99f987..d4c1365 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -491,6 +491,18 @@ static const struct bitmap_data testdata_32bppPBGRA = { static const struct bitmap_data testdata_32bppPRGBA = { &GUID_WICPixelFormat32bppPRGBA, 32, bits_32bppPBGRA, 32, 2, 96.0, 96.0}; +static const BYTE bits_64bppRGBA[] = { + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255,128, 255,128,0,128,0,128,255,128, 0,128,255,128,0,128,255,128, 0,128,0,128,255,128,255,128, 0,128,0,128,0,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255, + 128,0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255,128, 0,128,255,128,255,128,255,128, 255,128,0,128,255,128,255,128, 255,128,255,128,0,128,255,128, 255,128,255,128,255,128,255}; +static const struct bitmap_data testdata_64bppRGBA = { + &GUID_WICPixelFormat64bppRGBA, 64, bits_64bppRGBA, 32, 2, 96.0, 96.0}; + /* XP and 2003 use linear color conversion, later versions use sRGB gamma */ static const float bits_32bppGrayFloat_xp[] = { 0.114000f,0.587000f,0.299000f,0.000000f,0.114000f,0.587000f,0.299000f,0.000000f, @@ -1807,6 +1819,9 @@ START_TEST(converter) test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); test_conversion(&testdata_32bppBGRA, &testdata_24bppRGB, "32bppBGRA -> 24bppRGB", FALSE); + test_conversion(&testdata_64bppRGBA, &testdata_32bppRGBA, "64bppRGBA -> 32bppRGBA", FALSE); + test_conversion(&testdata_64bppRGBA, &testdata_32bppRGB, "64bppRGBA -> 32bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_32bppGrayFloat, "24bppRGB -> 32bppGrayFloat", FALSE); test_conversion(&testdata_32bppBGR, &testdata_32bppGrayFloat, "32bppBGR -> 32bppGrayFloat", FALSE);

1 0

Bryon Roche : windowscodecs: Byte swap png read/write for 16-bpp data.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: 0c0def962f2b86f44625f11d8d9d2013aaffa46a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0def962f2b86f44625f11d… Author: Bryon Roche <kain(a)kain.org> Date: Thu May 9 15:30:42 2019 -0500 windowscodecs: Byte swap png read/write for 16-bpp data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46558 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index db0fa9e..c0e272e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -332,6 +332,7 @@ MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS); MAKE_FUNCPTR(png_set_tRNS_to_alpha); MAKE_FUNCPTR(png_set_write_fn); +MAKE_FUNCPTR(png_set_swap); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); @@ -398,6 +399,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_tRNS); LOAD_FUNCPTR(png_set_tRNS_to_alpha); LOAD_FUNCPTR(png_set_write_fn); + LOAD_FUNCPTR(png_set_swap); LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); @@ -642,6 +644,10 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); + /* PNGs with bit-depth greater than 8 are network byte order. Windows does not expect this. */ + if (bit_depth > 8) + ppng_set_swap(This->png_ptr); + /* check for color-keyed alpha */ transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); @@ -1643,6 +1649,10 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, } } + /* Tell PNG we need to byte swap if writing a >8-bpp image */ + if (This->format->bit_depth > 8) + ppng_set_swap(This->png_ptr); + ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, This->format->bit_depth, This->format->color_type, This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,

1 0

Zhiyi Zhang : include: Add more kernel mode graphics driver definitions.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: 8a91cd6f0a6a104e7d02ed758e70d524dbb80619 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a91cd6f0a6a104e7d02ed75… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 9 20:27:10 2019 +0800 include: Add more kernel mode graphics driver definitions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dukmdt.h | 2 + include/ddk/d3dkmthk.h | 115 +++++++++++++++++++++++++++++ include/ntstatus.h | 192 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 309 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a91cd6f0a6a104e7d02…

1 0

Francois Gouget : jscript: Make the Enumerator_props functions static.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: cfcb7b7473d189f2a355ca33747cc60698fdf756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfcb7b7473d189f2a355ca33… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 9 10:59:39 2019 +0200 jscript: Make the Enumerator_props functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index aa7737a..d0502f6 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -40,7 +40,7 @@ static void Enumerator_destructor(jsdisp_t *dispex) heap_free(dispex); } -HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_atEnd\n"); @@ -48,7 +48,7 @@ HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return E_NOTIMPL; } -HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_item\n"); @@ -56,7 +56,7 @@ HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return E_NOTIMPL; } -HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_moveFirst\n"); @@ -64,7 +64,7 @@ HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_NOTIMPL; } -HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_moveNext\n");

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 May 2019