February 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 4/7] vkd3d-shader: Implement input registers for control point phase.
by Józef Kucia Feb. 13, 2019

Feb. 13, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f873fab32d43..886dbb19de88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3641,6 +3641,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { + case VKD3DSPR_INPUT: + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + return; case VKD3DSPR_OUTPOINTID: vkd3d_dxbc_compiler_emit_input_register(compiler, dst); return; -- 2.19.2

2 1

[PATCH vkd3d 3/7] vkd3d-shader: Add basic support for vpc registers in domain shaders.
by Józef Kucia Feb. 13, 2019

Feb. 13, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 44807e78a511..f873fab32d43 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1985,6 +1985,7 @@ struct vkd3d_dxbc_compiler bool after_declarations_section; const struct vkd3d_shader_signature *input_signature; const struct vkd3d_shader_signature *output_signature; + const struct vkd3d_shader_signature *patch_constant_signature; const struct vkd3d_shader_transform_feedback_info *xfb_info; struct vkd3d_shader_output_info { @@ -2039,6 +2040,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->input_signature = &shader_desc->input_signature; compiler->output_signature = &shader_desc->output_signature; + compiler->patch_constant_signature = &shader_desc->patch_constant_signature; if (shader_interface) { @@ -2376,6 +2378,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_JOININSTID: snprintf(buffer, buffer_size, "vJoinInstanceId"); break; + case VKD3DSPR_PATCHCONST: + snprintf(buffer, buffer_size, "vpc%u", idx); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -3451,6 +3456,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi unsigned int component_idx, component_count, input_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_signature_element *signature_element; + const struct vkd3d_shader_signature *shader_signature; const struct vkd3d_shader_register *reg = &dst->reg; uint32_t type_id, ptr_type_id, float_type_id; const struct vkd3d_spirv_builtin *builtin; @@ -3478,7 +3484,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi reg_idx = reg->idx[0].offset; } - if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->input_signature, + shader_signature = reg->type == VKD3DSPR_PATCHCONST + ? compiler->patch_constant_signature : compiler->input_signature; + + if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, NULL, reg_idx, dst->write_mask))) { FIXME("No signature element for shader input, ignoring shader input.\n"); @@ -3507,7 +3516,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi use_private_var = builtin && builtin->fixup_pfn; if (input_component_count != VKD3D_VEC4_SIZE - && vkd3d_count_signature_elements_for_reg(compiler->input_signature, reg_idx) > 1) + && vkd3d_count_signature_elements_for_reg(shader_signature, reg_idx) > 1) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; @@ -3529,6 +3538,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } + if (reg->type == VKD3DSPR_PATCHCONST) + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); + vkd3d_symbol_make_register(&reg_symbol, reg); if (!use_private_var) @@ -4651,7 +4663,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); - else if (vkd3d_shader_register_is_input(&dst->reg)) + else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d-shader: Translate vOutputControlPointID register.
by Józef Kucia Feb. 13, 2019

Feb. 13, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 849ebfb1ebfc..44807e78a511 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2362,6 +2362,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_COLOROUT: snprintf(buffer, buffer_size, "o%u", idx); break; + case VKD3DSPR_OUTPOINTID: + snprintf(buffer, buffer_size, "vOutputControlPointID"); + break; case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: @@ -3626,6 +3629,9 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { + case VKD3DSPR_OUTPOINTID: + vkd3d_dxbc_compiler_emit_input_register(compiler, dst); + return; case VKD3DSPR_FORKINSTID: case VKD3DSPR_JOININSTID: val_id = phase->instance_id; -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Improve heuristic for selecting physical device.
by Józef Kucia Feb. 13, 2019

Feb. 13, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5265ec987d86..b71d442c2b84 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -573,20 +573,19 @@ VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) } static void vkd3d_trace_physical_device(VkPhysicalDevice device, + const VkPhysicalDeviceProperties *vk_device_properties, const struct vkd3d_vk_instance_procs *vk_procs) { VkPhysicalDeviceMemoryProperties memory_properties; - VkPhysicalDeviceProperties device_properties; VkQueueFamilyProperties *queue_properties; unsigned int i, j; uint32_t count; - VK_CALL(vkGetPhysicalDeviceProperties(device, &device_properties)); - TRACE("Device name: %s.\n", device_properties.deviceName); - TRACE("Vendor ID: %#x, Device ID: %#x.\n", device_properties.vendorID, device_properties.deviceID); - TRACE("Driver version: %#x.\n", device_properties.driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(device_properties.apiVersion), - VK_VERSION_MINOR(device_properties.apiVersion), VK_VERSION_PATCH(device_properties.apiVersion)); + TRACE("Device name: %s.\n", vk_device_properties->deviceName); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", vk_device_properties->vendorID, vk_device_properties->deviceID); + TRACE("Driver version: %#x.\n", vk_device_properties->driverVersion); + TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(vk_device_properties->apiVersion), + VK_VERSION_MINOR(vk_device_properties->apiVersion), VK_VERSION_PATCH(vk_device_properties->apiVersion)); VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(device, &count, NULL)); TRACE("Queue families [%u]:\n", count); @@ -1031,8 +1030,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, VkPhysicalDevice *selected_device) { + VkPhysicalDevice dgpu_device = VK_NULL_HANDLE, igpu_device = VK_NULL_HANDLE; const struct vkd3d_vk_instance_procs *vk_procs = &instance->vk_procs; VkInstance vk_instance = instance->vk_instance; + VkPhysicalDeviceProperties device_properties; VkPhysicalDevice *physical_devices; uint32_t count; unsigned int i; @@ -1061,15 +1062,26 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, } for (i = 0; i < count; ++i) - vkd3d_trace_physical_device(physical_devices[i], vk_procs); + { + VK_CALL(vkGetPhysicalDeviceProperties(physical_devices[i], &device_properties)); + vkd3d_trace_physical_device(physical_devices[i], &device_properties, vk_procs); - if (count > 1) - FIXME("Multiple physical devices available, selecting the first one.\n"); + if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && !dgpu_device) + dgpu_device = physical_devices[i]; + else if (device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU && !igpu_device) + igpu_device = physical_devices[i]; + } - *selected_device = physical_devices[0]; + *selected_device = dgpu_device ? dgpu_device : igpu_device; + if (!*selected_device) + *selected_device = physical_devices[0]; vkd3d_free(physical_devices); + VK_CALL(vkGetPhysicalDeviceProperties(*selected_device, &device_properties)); + TRACE("Using device: %s, %#x:%#x.\n", device_properties.deviceName, + device_properties.vendorID, device_properties.deviceID); + return S_OK; } -- 2.19.2

2 1

[PATCH] kernel32: Support MUI_LANGUAGE_ID flag in EnumUILanguages.
by Jacek Caban Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/tests/locale.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2 v2] kernel32/tests: Add file mapping tests on readonly file
by Piotr Caban Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix test failures dlls/kernel32/tests/virtual.c | 41 +++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-)

2 2

[PATCH 2/2 v2] kernel32/tests: Test that copy-on-write file mapping is not modifying the file.
by Piotr Caban Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 8 ++++++++ 1 file changed, 8 insertions(+)

2 1

[PATCH 3/3] kernel32/tests: Test that memory changes are visible in copy-on-write mappings
by Piotr Caban Feb. 13, 2019

Feb. 13, 2019

This test introduces new failures on Mac OS. I'll resend it later together with changes to the implementation. --- dlls/kernel32/tests/virtual.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)

2 1

[PATCH 2/3] kernel32/tests: Test that copy-on-write file mapping is not modifying the file.
by Piotr Caban Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 7 +++++++ 1 file changed, 7 insertions(+)

2 1

[PATCH 1/3] kernel32/tests: Add file mapping tests on readonly file
by Piotr Caban Feb. 13, 2019

Feb. 13, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 40 +++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-)

2 1