September 2018 - Wine-commits

Józef Kucia : vkd3d-shader: Add support for more interpolation modifiers.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: 6296758849ad0eb8a668c1a2ec03dfa8457e6fe4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6296758849ad0eb8a668c1a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:25:56 2018 +0200 vkd3d-shader: Add support for more interpolation modifiers. 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-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1181c84..10134bf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3973,6 +3973,12 @@ static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc break; case VKD3DSIM_LINEAR: break; + case VKD3DSIM_LINEAR_CENTROID: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); + break; + case VKD3DSIM_LINEAR_NOPERSPECTIVE: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); + break; case VKD3DSIM_LINEAR_SAMPLE: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0);

1 0

Józef Kucia : vkd3d-shader: Implement texel offsets for ld instructions.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: 0b278a7773d8961348126e44c699084914082909 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0b278a7773d8961348126e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:25:57 2018 +0200 vkd3d-shader: Implement texel offsets for ld instructions. 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-shader/spirv.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 10134bf..f0e2491 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5262,6 +5262,17 @@ static void vkd3d_dxbc_compiler_prepare_sampled_image(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg), depth_comparison); } +static uint32_t vkd3d_dxbc_compiler_emit_texel_offset(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction, + const struct vkd3d_spirv_resource_type *resource_type_info) +{ + const struct vkd3d_shader_texel_offset *offset = &instruction->texel_offset; + unsigned int component_count = resource_type_info->offset_component_count; + int32_t data[4] = {offset->u, offset->v, offset->w, 0}; + return vkd3d_dxbc_compiler_get_constant(compiler, + VKD3D_TYPE_INT, component_count, (const uint32_t *)data); +} + static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5275,9 +5286,6 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, uint32_t image_operands[2]; DWORD coordinate_mask; - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - /* OpImageFetch must be used with a sampled image. */ vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); @@ -5291,6 +5299,12 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_3); } + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, image_id, coordinate_id, operands_mask, image_operands, image_operand_count); @@ -5386,17 +5400,6 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil dst, val_id, image.sampled_type, src[1].swizzle); } -static uint32_t vkd3d_dxbc_compiler_emit_texel_offset(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction, - const struct vkd3d_spirv_resource_type *resource_type_info) -{ - const struct vkd3d_shader_texel_offset *offset = &instruction->texel_offset; - unsigned int component_count = resource_type_info->offset_component_count; - int32_t data[4] = {offset->u, offset->v, offset->w, 0}; - return vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_INT, component_count, (const uint32_t *)data); -} - static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) {

1 0

Józef Kucia : vkd3d-shader: Implement texel offset for sample instructions.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: ae5471b97881fbd3a6e0daa7257ac0a990df2d6f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae5471b97881fbd3a6e0daa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:25:58 2018 +0200 vkd3d-shader: Implement texel offset for sample instructions. 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-shader/spirv.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0e2491..964bc49 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5322,7 +5322,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; switch (instruction->handler_idx) @@ -5341,11 +5341,16 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler return; } - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_NONE); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); val_id = vkd3d_spirv_build_op_image_sample(builder, op, sampled_type_id,

1 0

Józef Kucia : tests: Add test for ld instruction with texel offsets.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: abd775fb83aa37435d2f596ffd0a3938d5c2a941 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abd775fb83aa37435d2f596… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:25:59 2018 +0200 tests: Add test for ld instruction with texel offsets. 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 | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=abd775fb83aa37435d2…

1 0

Józef Kucia : vkd3d: Fix leaks if d3d12_device_init_pipeline_cache() fails.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: 0e8fc6e957faab365b3f021b94619dd3ca7bdcaf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e8fc6e957faab365b3f021… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:26:00 2018 +0200 vkd3d: Fix leaks if d3d12_device_init_pipeline_cache() fails. 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/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c1db7d3..b57e3ce 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1280,6 +1280,14 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) VkResult vr; int rc; + if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + + rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); + cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; cache_info.flags = 0; @@ -1292,14 +1300,6 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) device->vk_pipeline_cache = VK_NULL_HANDLE; } - rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); - - if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) - { - ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; - } - return S_OK; }

1 0

Józef Kucia : vkd3d: Partially implement clears for texture UAVs.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: b9d7569b8cdba8b5a01cfabe58a284eb9c3babae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9d7569b8cdba8b5a01cfab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:26:01 2018 +0200 vkd3d: Partially implement clears for texture UAVs. In the long term, we may want to use shaders to clear UAVs. 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 | 37 +++++++++++++++++++++++++++---------- libs/vkd3d/resource.c | 8 ++++++-- libs/vkd3d/vkd3d_private.h | 16 ++++++++++++++-- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5e67e66..decff14 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3881,6 +3881,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; + VkImageSubresourceRange range; + VkClearColorValue color; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); @@ -3891,11 +3893,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_track_resource_usage(list, resource_impl); - if (d3d12_resource_is_texture(resource_impl)) - { - FIXME("Not implemented for textures.\n"); - return; - } if (rect_count) { FIXME("Clear rects not supported.\n"); @@ -3905,14 +3902,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_end_current_render_pass(list); cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); - if (!cpu_descriptor->view_size) + + if (d3d12_resource_is_buffer(resource_impl)) { - FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); - return; + if (!cpu_descriptor->uav.buffer.size) + { + FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); + return; + } + + VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, + cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); } + else + { + color.uint32[0] = values[0]; + color.uint32[1] = values[1]; + color.uint32[2] = values[2]; + color.uint32[3] = values[3]; + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = cpu_descriptor->uav.texture.miplevel_idx; + range.levelCount = 1; + range.baseArrayLayer = cpu_descriptor->uav.texture.layer_idx; + range.layerCount = cpu_descriptor->uav.texture.layer_count; - VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, - cpu_descriptor->view_offset, cpu_descriptor->view_size, values[0])); + VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, + resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); + } } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 88ab645..4490ae2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1635,8 +1635,8 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ { const struct vkd3d_format *format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); - descriptor->view_offset = desc->u.Buffer.FirstElement * format->byte_count; - descriptor->view_size = desc->u.Buffer.NumElements * format->byte_count; + descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; + descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; } } @@ -1691,6 +1691,10 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor->u.view = view; + + descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; + descriptor->uav.texture.layer_idx = vkd3d_desc.layer_idx; + descriptor->uav.texture.layer_count = vkd3d_desc.layer_count; } void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5461cc3..6ba12f9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -272,8 +272,20 @@ struct d3d12_desc struct vkd3d_view *view; } u; - VkDeviceSize view_offset; - VkDeviceSize view_size; + union + { + struct + { + VkDeviceSize offset; + VkDeviceSize size; + } buffer; + struct + { + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } uav; }; static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle)

1 0

Józef Kucia : tests: Add missing resource barrier to test_texture().
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: ee0c715e7d49f4133a4ad87eaa1af66dda31d6a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee0c715e7d49f4133a4ad87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:26:02 2018 +0200 tests: Add missing resource barrier to test_texture(). 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 659a5c6..85e480c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9203,6 +9203,8 @@ static void test_texture(void) ID3D12Resource_Release(texture); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } ID3D12DescriptorHeap_Release(heap);

1 0

Józef Kucia : tests: Clear command list before uint tests in test_shader_instructions().
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: vkd3d Branch: master Commit: 865430d2b13e7043f4f88d3434559616793d90d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=865430d2b13e7043f4f88d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 13 11:26:03 2018 +0200 tests: Clear command list before uint tests in test_shader_instructions(). Avoids referencing a destroyed render target in the command list. 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 85e480c..808562e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5272,6 +5272,7 @@ static void test_shader_instructions(void) ID3D12CommandQueue *queue; unsigned int i, x, y; ID3D12Resource *cb; + HRESULT hr; static const DWORD ps_div_code[] = { @@ -7392,6 +7393,9 @@ static void test_shader_instructions(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); ID3D12Resource_Release(context.render_target); desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT; create_render_target(&context, &desc, &context.render_target, &context.rtv);

1 0

Alexandre Julliard : Wine release 3.0.3
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: website Branch: master Commit: 0285a5a2d52719d494d38b3c23934f43244a21dc URL: https://source.winehq.org/git/website.git/?a=commit;h=0285a5a2d52719d494d38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 10:49:25 2018 +0200 Wine release 3.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018091301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018091301.xml b/news/en/2018091301.xml new file mode 100644 index 0000000..5e08578 --- /dev/null +++ b/news/en/2018091301.xml @@ -0,0 +1,12 @@ +<news> +<date>September 13, 2018</date> +<title>Wine 3.0.3 Released</title> +<body> + The Wine maintenance release 3.0.3 is now available. + <a href="{$root}/announce/3.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.3.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

Alexandre Julliard : winex11: Use the client window support also for XComposite child windows.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: c8bebe0f4b760462cf3a81c6887349175c38c3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8bebe0f4b760462cf3a81c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:49:23 2018 +0100 winex11: Use the client window support also for XComposite child windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ce36987eba0a9310f3e0ac6bd55148ededca7c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 62 ++++--------------------- dlls/winex11.drv/window.c | 116 +++++++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 4 +- 3 files changed, 80 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8bebe0f4b760462cf3a…

1 0