February 2019 - Wine-commits

Hans Leidekker : bcrypt: Implement BCryptDeriveKeyPBKDF2.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: f0a18f6f19ffc0455b67d94f10d423f96715122f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a18f6f19ffc0455b67d94f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:18 2019 +0100 bcrypt: Implement BCryptDeriveKeyPBKDF2. Based on a patch by Jack Grigg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 1 + dlls/bcrypt/bcrypt_main.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 91 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 1 + 5 files changed, 180 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a18f6f19ffc0455b67…

1 0

Vijay Kiran Kamuju : setupapi: Add stub for CM_Get_Sibling.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 01b8a795952b460189fc1fc91eff8e733c4e053d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b8a795952b460189fc1fc9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Feb 12 21:34:12 2019 +0100 setupapi: Add stub for CM_Get_Sibling. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 2 +- .../api-ms-win-devices-config-l1-1-1.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index fcd3aaa..6fe5ee3 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -21,7 +21,7 @@ @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_Open_Class_KeyW @ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index ab2a8a9..33dad4e 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -21,7 +21,7 @@ @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 2438083d..20ede7b 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -113,7 +113,7 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) setupapi.CM_Get_Sibling_Ex @ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 844bb21..cea6dac 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -123,7 +123,7 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 61ce005..4994ca4 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -501,6 +501,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON } /*********************************************************************** + * CM_Get_Sibling (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Sibling( + PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags) +{ + FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, DevInst, ulFlags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_Sibling_Ex (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Sibling_Ex( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index b8def60..da09115 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -205,6 +205,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG);

1 0

Piotr Caban : kernel32/tests: Add file mapping tests on readonly file.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: wine Branch: master Commit: 43a4401ebd3e7f2184123c4f4980e65fa0b8b7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a4401ebd3e7f2184123c4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 13 11:43:12 2019 +0100 kernel32/tests: Add file mapping tests on readonly file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a343fa4..01c698d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3889,7 +3889,7 @@ static void *map_view_of_file(HANDLE handle, DWORD access) return addr; } -static void test_mapping( HANDLE hfile, DWORD sec_flags ) +static void test_mapping( HANDLE hfile, DWORD sec_flags, BOOL readonly ) { static const DWORD page_prot[] = { @@ -3940,12 +3940,26 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) MEMORY_BASIC_INFORMATION info, nt_info; BOOL anon_mapping = (hfile == INVALID_HANDLE_VALUE); - trace( "testing %s mapping flags %08x\n", anon_mapping ? "anonymous" : "file", sec_flags ); + trace( "testing %s mapping flags %08x %s\n", anon_mapping ? "anonymous" : "file", + sec_flags, readonly ? "readonly file" : "" ); for (i = 0; i < ARRAY_SIZE(page_prot); i++) { SetLastError(0xdeadbeef); hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, si.dwPageSize, NULL); + if (readonly && (page_prot[i] == PAGE_READWRITE || page_prot[i] == PAGE_EXECUTE_READ + || page_prot[i] == PAGE_EXECUTE_READWRITE || page_prot[i] == PAGE_EXECUTE_WRITECOPY)) + { + todo_wine_if(page_prot[i] == PAGE_EXECUTE_READ || page_prot[i] == PAGE_EXECUTE_WRITECOPY) + { + ok(!hmap, "%d: CreateFileMapping(%04x) should fail\n", i, page_prot[i]); + ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == ERROR_INVALID_PARAMETER), + "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + if (hmap) CloseHandle(hmap); + continue; + } + if (page_prot[i] == PAGE_NOACCESS) { HANDLE hmap2; @@ -3958,7 +3972,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) if (sec_flags & SEC_IMAGE) hmap = CreateFileMappingW(hfile, NULL, PAGE_WRITECOPY | sec_flags, 0, si.dwPageSize, NULL); else - hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | sec_flags, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, PAGE_READONLY | sec_flags, 0, si.dwPageSize, NULL); ok(hmap != 0, "CreateFileMapping(PAGE_READWRITE) error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), hmap, GetCurrentProcess(), &hmap2, 0, FALSE, 0); @@ -3968,7 +3982,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) } if (page_prot[i] == PAGE_EXECUTE) { - ok(!hmap, "CreateFileMapping(PAGE_NOACCESS) should fail\n"); + ok(!hmap, "CreateFileMapping(PAGE_EXECUTE) should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); continue; @@ -4101,12 +4115,15 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) continue; } + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); prev_prot = actual_prot; ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(info.Protect == actual_prot, "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", page_prot[i], view[j].prot, page_prot[k], info.Protect ); @@ -4161,6 +4178,7 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) { ret = VirtualProtect(base, si.dwPageSize, PAGE_WRITECOPY, &old_prot); + todo_wine_if(readonly && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x\n", GetLastError(), page_prot[i], view[j].prot); if (ret) *(DWORD*)base = 0xdeadbeef; ret = VirtualQuery(base, &info, sizeof(info)); @@ -4187,7 +4205,9 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) continue; } + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY) ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); ret = VirtualQuery(base, &info, sizeof(info)); @@ -4226,7 +4246,14 @@ static void test_mappings(void) SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); - test_mapping( hfile, SEC_COMMIT ); + test_mapping( hfile, SEC_COMMIT, FALSE ); + + CloseHandle( hfile ); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + + test_mapping( hfile, SEC_COMMIT, TRUE ); CloseHandle( hfile ); DeleteFileA( file_name ); @@ -4238,12 +4265,12 @@ static void test_mappings(void) hfile = CreateFileA( file_name, GENERIC_READ|GENERIC_EXECUTE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); - test_mapping( hfile, SEC_IMAGE ); + test_mapping( hfile, SEC_IMAGE, FALSE ); CloseHandle( hfile ); /* now anonymous mappings */ - test_mapping( INVALID_HANDLE_VALUE, SEC_COMMIT ); + test_mapping( INVALID_HANDLE_VALUE, SEC_COMMIT, FALSE ); } static void test_shared_memory(BOOL is_child)

1 0

Józef Kucia : vkd3d: Improve heuristic for selecting physical device.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: 269bb649d7ade5455c7d8903a3da43c9697f0bf0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=269bb649d7ade5455c7d890… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:28 2019 +0100 vkd3d: Improve heuristic for selecting physical device. 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 | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5265ec9..b71d442 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; }

1 0

Józef Kucia : vkd3d-shader: Translate vOutputControlPointID register.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: 1a5f058f4a8b4aad3ad8f0acb16562554b73eca8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1a5f058f4a8b4aad3ad8f0a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:29 2019 +0100 vkd3d-shader: Translate vOutputControlPointID register. 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 849ebfb..44807e7 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;

1 0

Józef Kucia : vkd3d-shader: Add basic support for vpc registers in domain shaders.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: efe68b00bbf1ea6c989042475523d2256ebff37a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=efe68b00bbf1ea6c9890424… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:30 2019 +0100 vkd3d-shader: Add basic support for vpc registers in domain shaders. 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 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 44807e7..f873fab 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);

1 0

Józef Kucia : vkd3d-shader: Implement input registers for control point phase.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: d30afc37c4b9c0e8382a4cc7610ca702b5d371d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d30afc37c4b9c0e8382a4cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:31 2019 +0100 vkd3d-shader: Implement input registers for control point phase. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f873fab..886dbb1 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;

1 0

Józef Kucia : vkd3d-shader: Implement relative addressing for arrayed registers.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: 7fde0ac78f3a666dff5cb7bf1451f006c258a7a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7fde0ac78f3a666dff5cb7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:32 2019 +0100 vkd3d-shader: Implement relative addressing for arrayed registers. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 886dbb1..9833fd9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2589,12 +2589,12 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else { - if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) + if (reg->idx[1].rel_addr) FIXME("Relative addressing not implemented.\n"); /* Handle arrayed registers, e.g. v[3][0]. */ if (reg->idx[1].offset != ~0u) - indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, reg->idx[0].offset); + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); } if (index_count)

1 0

Józef Kucia : vkd3d-shader: Implement user patch constants for hull shaders.
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: b1b3405bcf3e9526f61116352dc23d2ec072388b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b1b3405bcf3e9526f611163… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:33 2019 +0100 vkd3d-shader: Implement user patch constants for hull shaders. 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 | 153 +++++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 68 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9833fd9..97963e9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3375,6 +3375,70 @@ static unsigned int vkd3d_count_signature_elements_for_reg( return count; } +static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, + struct vkd3d_shader_phase *phase) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + unsigned int param_count; + uint32_t param_type_id; + const char *name; + + if (phase->instance_count) + { + param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + param_count = 1; + } + else + { + param_count = 0; + } + + phase->function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); + vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, + SpvFunctionControlMaskNone, function_type_id); + + if (phase->instance_count) + phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_type_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + + switch (phase->type) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid phase type %#x.\n", phase->type); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); +} + +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( + struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_shader_phase *phase; + + if (!compiler->shader_phase_count) + return NULL; + + phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + if (!phase->function_id) + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + return phase; +} + static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler *compiler, uint32_t id, unsigned int component_count, const struct vkd3d_shader_signature_element *signature_element) { @@ -3806,17 +3870,25 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler unsigned int component_idx, component_count, output_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; const struct vkd3d_spirv_builtin *builtin; enum vkd3d_component_type component_type; + const struct vkd3d_shader_phase *phase; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; unsigned int signature_idx; bool use_private_variable; + bool is_patch_constant; uint32_t id, var_id; - if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, + phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); + is_patch_constant = phase && (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE); + + shader_signature = is_patch_constant ? compiler->patch_constant_signature : compiler->output_signature; + + if (!(signature_element = vkd3d_find_signature_element_for_reg(shader_signature, &signature_idx, reg->idx[0].offset, dst->write_mask))) { FIXME("No signature element for shader output, ignoring shader output.\n"); @@ -3875,11 +3947,17 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } + if (is_patch_constant) + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); + vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); } - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; + if (!is_patch_constant) + { + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + } use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -3905,7 +3983,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } - if (use_private_variable) + if (use_private_variable && is_patch_constant) + FIXME("Private variables not supported for patch constants.\n"); + + if (use_private_variable && !is_patch_constant) { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; @@ -3996,70 +4077,6 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } -static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, - struct vkd3d_shader_phase *phase) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, function_type_id; - unsigned int param_count; - uint32_t param_type_id; - const char *name; - - if (phase->instance_count) - { - param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); - param_count = 1; - } - else - { - param_count = 0; - } - - phase->function_id = vkd3d_spirv_alloc_id(builder); - - void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); - vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, - SpvFunctionControlMaskNone, function_type_id); - - if (phase->instance_count) - phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_type_id); - - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); - phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - - switch (phase->type) - { - case VKD3DSIH_HS_CONTROL_POINT_PHASE: - name = "control"; - break; - case VKD3DSIH_HS_FORK_PHASE: - name = "fork"; - break; - case VKD3DSIH_HS_JOIN_PHASE: - name = "join"; - break; - default: - ERR("Invalid phase type %#x.\n", phase->type); - return; - } - vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); -} - -static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - struct vkd3d_dxbc_compiler *compiler) -{ - struct vkd3d_shader_phase *phase; - - if (!compiler->shader_phase_count) - return NULL; - - phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; - if (!phase->function_id) - vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); - return phase; -} - static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;

1 0

Józef Kucia : tests: Get rid of ID3D12Object_SetName( object, NULL).
by Alexandre Julliard 13 Feb '19

13 Feb '19

Module: vkd3d Branch: master Commit: 48ed937de38d1e08b07eefff63ddb9a555b5698b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=48ed937de38d1e08b07eeff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 12 17:41:34 2019 +0100 tests: Get rid of ID3D12Object_SetName(object, NULL). It crashes on Windows. 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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 29f976d..b80cc7b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2996,9 +2996,6 @@ static void test_object_interface(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } - hr = ID3D12Object_SetName(object, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = ID3D12Object_SetName(object, emptyW); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0