March 2019 - Wine-Commits - list.winehq.org

Francois Gouget : setupapi/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 9f2baf1dd49590a0f8dada5a050719b7e2be697c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2baf1dd49590a0f8dada5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:41:29 2019 +0100 setupapi/tests: Add a trailing '\n' to a couple of ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0f27783..004a956 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -63,13 +63,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError());

1 0

Jactry Zeng : mfplat: Implement IMFAttributes::DeleteItem().
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 50a57f8613f170d680191a9ccf4ffe485c56e1e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50a57f8613f170d680191a9c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:09 2019 +0300 mfplat: Implement IMFAttributes::DeleteItem(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 24 ++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8ab7c97..e12847e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -837,9 +837,29 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) { - FIXME("%p, %s.\n", iface, debugstr_attr(key)); + struct attributes *attributes = impl_from_IMFAttributes(iface); + struct attribute *attribute; + size_t index = 0; - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, debugstr_attr(key)); + + EnterCriticalSection(&attributes->cs); + + if ((attribute = attributes_find_item(attributes, key, &index))) + { + size_t count; + + PropVariantClear(&attribute->value); + + attributes->count--; + count = attributes->count - index; + if (count) + memmove(&attributes->attributes[index], &attributes->attributes[index + 1], count * sizeof(*attributes->attributes)); + } + + LeaveCriticalSection(&attributes->cs); + + return S_OK; } static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8550160..3a94d4b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -583,7 +583,10 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "Failed to set item, hr %#x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); - todo_wine ok(hr == S_OK, "Failed to delete item, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to delete item, hr %#x.\n", hr); + + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID3, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#x.\n", hr);

1 0

Józef Kucia : vkd3d: Remove FIXME() from vkd3d_get_format().
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: vkd3d Branch: master Commit: f523c642a4d8165915749df1456447b502684288 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f523c642a4d8165915749df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 11:35:02 2019 +0100 vkd3d: Remove FIXME() from vkd3d_get_format(). 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/utils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index e8ebd2c..0abb62f 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -163,7 +163,6 @@ const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format, bool depth_ return &vkd3d_formats[i]; } - FIXME("Unhandled DXGI format %#x.\n", dxgi_format); return NULL; }

1 0

Józef Kucia : tests: Fix Vulkan validation error in test_copy_descriptors().
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: vkd3d Branch: master Commit: fb0fa9d2ab5b8418d0f773da104563197fe0bcf2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fb0fa9d2ab5b8418d0f773d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 11:35:03 2019 +0100 tests: Fix Vulkan validation error in test_copy_descriptors(). 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, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 654770a..b10e255 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14684,7 +14684,7 @@ static void test_copy_descriptors(void) D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); t[2] = create_default_texture(context.device, - 1, 1, DXGI_FORMAT_R32_UINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); + 1, 1, DXGI_FORMAT_R32_SINT, 0, D3D12_RESOURCE_STATE_COPY_DEST); data.pData = &t2_data; data.RowPitch = sizeof(t2_data); data.SlicePitch = data.RowPitch;

1 0

Józef Kucia : vkd3d-shader: Translate eval_centroid shader instructions.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: vkd3d Branch: master Commit: c6477964a38873b61f0b479db1ba251e33bd7614 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c6477964a38873b61f0b479… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 11:34:54 2019 +0100 vkd3d-shader: Translate eval_centroid shader 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/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 24 ++++++++++++++++++------ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7cc11e7..996a7e5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -296,6 +296,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -1108,6 +1109,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, + {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index accdd75..e13d730 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7605,7 +7605,7 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } -static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_eval_attrib(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -7614,6 +7614,8 @@ static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *com const struct vkd3d_shader_register *input = &src[0].reg; uint32_t instr_set_id, type_id, val_id, src_ids[2]; struct vkd3d_shader_register_info register_info; + unsigned int src_count = 0; + enum GLSLstd450 op; if (!vkd3d_dxbc_compiler_get_register_info(compiler, input, &register_info)) return; @@ -7626,15 +7628,24 @@ static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *com vkd3d_spirv_enable_capability(builder, SpvCapabilityInterpolationFunction); - src_ids[0] = register_info.id; - src_ids[1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + src_ids[src_count++] = register_info.id; + + if (instruction->handler_idx == VKD3DSIH_EVAL_CENTROID) + { + op = GLSLstd450InterpolateAtCentroid; + } + else + { + assert(instruction->handler_idx == VKD3DSIH_EVAL_SAMPLE_INDEX); + op = GLSLstd450InterpolateAtSample; + src_ids[src_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + } type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, vkd3d_write_mask_component_count(register_info.write_mask)); instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); - val_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, - instr_set_id, GLSLstd450InterpolateAtSample, src_ids, 2); + val_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, instr_set_id, op, src_ids, src_count); val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, register_info.write_mask, VKD3D_TYPE_FLOAT, src[0].swizzle, dst->write_mask); @@ -8048,8 +8059,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_SAMPLE_INFO: vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); break; + case VKD3DSIH_EVAL_CENTROID: case VKD3DSIH_EVAL_SAMPLE_INDEX: - vkd3d_dxbc_compiler_emit_interpolate(compiler, instruction); + vkd3d_dxbc_compiler_emit_eval_attrib(compiler, instruction); break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index bb0e6ad..13fb117 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -130,6 +130,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_ENDREP */ "endrep", /* VKD3DSIH_ENDSWITCH */ "endswitch", /* VKD3DSIH_EQ */ "eq", + /* VKD3DSIH_EVAL_CENTROID */ "eval_centroid", /* VKD3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* VKD3DSIH_EXP */ "exp", /* VKD3DSIH_EXPP */ "expp", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a686096..fba493e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -156,6 +156,7 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER VKD3DSIH_ENDREP, VKD3DSIH_ENDSWITCH, VKD3DSIH_EQ, + VKD3DSIH_EVAL_CENTROID, VKD3DSIH_EVAL_SAMPLE_INDEX, VKD3DSIH_EXP, VKD3DSIH_EXPP,

1 0

Józef Kucia : vkd3d: Add VKD3D_VULKAN_DEVICE debug environment variable.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: vkd3d Branch: master Commit: 05666d3385f52610dd2eb38fa27b47ead4bfd2a9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=05666d3385f52610dd2eb38… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 11:34:56 2019 +0100 vkd3d: Add VKD3D_VULKAN_DEVICE debug environment variable. 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> --- include/private/vkd3d_debug.h | 2 ++ libs/vkd3d-common/debug.c | 20 +++++++++++++++++++- libs/vkd3d/device.c | 26 +++++++++++++++++++------- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 8b4c77d..42e5903 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -70,4 +70,6 @@ static inline const char *debugstr_guid(const GUID *guid) guid->Data4[5], guid->Data4[6], guid->Data4[7]); } +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; + #endif /* __VKD3D_DEBUG_H */ diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index ee23ab0..9d10c28 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -20,10 +20,11 @@ #include <assert.h> #include <ctype.h> +#include <errno.h> +#include <inttypes.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <inttypes.h> #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 @@ -297,3 +298,20 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) return debugstr_w16((const uint16_t *)wstr); return debugstr_w32((const uint32_t *)wstr); } + +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) +{ + const char *value = getenv(name); + unsigned long r; + char *end_ptr; + + if (value) + { + errno = 0; + r = strtoul(value, &end_ptr, 0); + if (!errno && end_ptr != value) + return r; + } + + return default_value; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 204489c..f809a00 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1061,12 +1061,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, } static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, - VkPhysicalDevice *selected_device) + unsigned int device_index, 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 device = VK_NULL_HANDLE; VkPhysicalDevice *physical_devices; uint32_t count; unsigned int i; @@ -1094,27 +1095,36 @@ static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, return hresult_from_vk_result(vr); } + if (device_index != ~0u && device_index >= count) + WARN("Device index %u is out of range.\n", device_index); + for (i = 0; i < count; ++i) { VK_CALL(vkGetPhysicalDeviceProperties(physical_devices[i], &device_properties)); vkd3d_trace_physical_device(physical_devices[i], &device_properties, vk_procs); + if (i == device_index) + device = physical_devices[i]; + 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 = dgpu_device ? dgpu_device : igpu_device; - if (!*selected_device) - *selected_device = physical_devices[0]; + if (!device) + device = dgpu_device ? dgpu_device : igpu_device; + if (!device) + device = physical_devices[0]; vkd3d_free(physical_devices); - VK_CALL(vkGetPhysicalDeviceProperties(*selected_device, &device_properties)); + VK_CALL(vkGetPhysicalDeviceProperties(device, &device_properties)); TRACE("Using device: %s, %#x:%#x.\n", device_properties.deviceName, device_properties.vendorID, device_properties.deviceID); + *selected_device = device; + return S_OK; } @@ -1285,6 +1295,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDeviceFeatures2 features2; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; + unsigned int device_index; uint32_t extension_count; const char **extensions; VkDevice vk_device; @@ -1294,8 +1305,9 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, TRACE("device %p, create_info %p.\n", device, create_info); physical_device = create_info->vk_physical_device; - if (!physical_device - && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) + device_index = vkd3d_env_var_as_uint("VKD3D_VULKAN_DEVICE", ~0u); + if ((!physical_device || device_index != ~0u) + && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, device_index, &physical_device))) return hr; device->vk_physical_device = physical_device;

1 0

Józef Kucia : tests: Add test for eval attribute shader instructions.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: vkd3d Branch: master Commit: 3629bc1ca95f5c94831f5256094e13cb7a53bbca URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3629bc1ca95f5c94831f525… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 11:34:55 2019 +0100 tests: Add test for eval attribute shader 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> --- tests/d3d12.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3629bc1ca95f5c94831…

1 0

Józef Kucia : vkd3d-shader: Translate eval_sample_index shader instructions.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: vkd3d Branch: master Commit: 38f5081496666ddac4a8c1af8d3400868ab4debf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=38f5081496666ddac4a8c1a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 14 11:34:53 2019 +0100 vkd3d-shader: Translate eval_sample_index shader 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 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a734539..accdd75 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7605,6 +7605,43 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_interpolate(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_shader_register *input = &src[0].reg; + uint32_t instr_set_id, type_id, val_id, src_ids[2]; + struct vkd3d_shader_register_info register_info; + + if (!vkd3d_dxbc_compiler_get_register_info(compiler, input, &register_info)) + return; + + if (register_info.storage_class != SpvStorageClassInput) + { + FIXME("Not supported for storage class %#x.\n", register_info.storage_class); + return; + } + + vkd3d_spirv_enable_capability(builder, SpvCapabilityInterpolationFunction); + + src_ids[0] = register_info.id; + src_ids[1] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + + type_id = vkd3d_spirv_get_type_id(builder, + VKD3D_TYPE_FLOAT, vkd3d_write_mask_component_count(register_info.write_mask)); + + instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); + val_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, + instr_set_id, GLSLstd450InterpolateAtSample, src_ids, 2); + + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, register_info.write_mask, VKD3D_TYPE_FLOAT, src[0].swizzle, dst->write_mask); + + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + /* From the Vulkan spec: * * "Scope for execution must be limited to: * Workgroup * Subgroup" @@ -8011,6 +8048,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_SAMPLE_INFO: vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); break; + case VKD3DSIH_EVAL_SAMPLE_INDEX: + vkd3d_dxbc_compiler_emit_interpolate(compiler, instruction); + break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); break;

1 0

Francois Gouget : testbot/TestLauncher: Add an Emacs directive to get 3-space indentation.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: tools Branch: master Commit: 236853c2dd8aacc124ca25d385758fc7d0c25570 URL: https://source.winehq.org/git/tools.git/?a=commit;h=236853c2dd8aacc124ca25d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 12:04:01 2019 +0100 testbot/TestLauncher: Add an Emacs directive to get 3-space indentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 15929c5..783dbab 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; c-basic-offset: 3; indent-tabs-mode: nil -*- */ /* * Verifies that the dlls needed for the test are present. * @@ -34,8 +35,8 @@ static const char *LocationFile; static unsigned LocationLine; static void _SetErrorLocation(const char* file, int line) { - LocationFile = file; - LocationLine = line; + LocationFile = file; + LocationLine = line; } #ifdef __GNUC__

1 0

Francois Gouget : testbot/SetWinLocale: Fix setting the VM description.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: tools Branch: master Commit: 2ded1320e329d9f5ab9824710a8fb51495035b72 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2ded1320e329d9f5ab98247… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 12:02:00 2019 +0100 testbot/SetWinLocale: Fix setting the VM description. There is no $Suffix variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index e9d024f..5ca0507 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -649,7 +649,7 @@ if ($OptRefresh) $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); $VM->Hostname($BaseVM->Hostname); - my $Description = $BaseVM->Description ." ". LocaleName($Suffix); + my $Description = $BaseVM->Description ." ". LocaleName($VMLocale); my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); if ($PropertyDescriptor->GetMaxLength() < length($Description)) {

1 0