October 2021 - Wine-Commits

Rémi Bernon : dinput: Use wide char string literals.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 87c7f1bdcee82389224b6ec5196c9bea20879b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c7f1bdcee82389224b6ec5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:59 2021 +0200 dinput: Use wide char string literals. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 3 +-- dlls/dinput/device.c | 12 +++--------- dlls/dinput/dinput_main.c | 12 +++++------- dlls/dinput/joystick_hid.c | 6 ++---- dlls/dinput/mouse.c | 21 +++++++-------------- 5 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 0b76b8e077c..01a92e54bd4 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -132,8 +132,7 @@ static int lv_get_item_data(HWND dialog, int index) static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW lpdiaf) { - static const WCHAR no_action[] = {'-','\0'}; - const WCHAR *action_text = no_action; + const WCHAR *action_text = L"-"; LVITEMW lvItem; if (item < 0) return; diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a8ba16afe59..8af593c6ff5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -686,11 +686,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) */ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WCHAR *guid) { - static const WCHAR subkey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','i','r','e','c','t','I','n','p','u','t','\\', - 'M','a','p','p','i','n','g','s','\\','%','s','\\','%','s','\\','%','s','\0'}; + static const WCHAR *subkey = L"Software\\Wine\\DirectInput\\Mappings\\%s\\%s\\%s"; HKEY hkey; WCHAR *keyname; @@ -733,13 +729,12 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM */ for (i = 0; i < lpdiaf->dwNumActions; i++) { - static const WCHAR format[] = {'%','x','\0'}; WCHAR label[9]; if (IsEqualGUID(&didev.guidInstance, &lpdiaf->rgoAction[i].guidInstance) && lpdiaf->rgoAction[i].dwHow != DIAH_UNMAPPED) { - swprintf( label, 9, format, lpdiaf->rgoAction[i].dwSemantic ); + swprintf( label, 9, L"%x", lpdiaf->rgoAction[i].dwSemantic ); RegSetValueExW( hkey, label, 0, REG_DWORD, (const BYTE *)&lpdiaf->rgoAction[i].dwObjID, sizeof(DWORD) ); } @@ -775,11 +770,10 @@ static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMAT /* Try to read each action in the DIACTIONFORMAT from registry */ for (i = 0; i < lpdiaf->dwNumActions; i++) { - static const WCHAR format[] = {'%','x','\0'}; DWORD id, size = sizeof(DWORD); WCHAR label[9]; - swprintf( label, 9, format, lpdiaf->rgoAction[i].dwSemantic ); + swprintf( label, 9, L"%x", lpdiaf->rgoAction[i].dwSemantic ); if (!RegQueryValueExW(hkey, label, 0, NULL, (LPBYTE) &id, &size)) { diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 06eef8aa168..a01a6adfad5 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -83,7 +83,6 @@ static const struct dinput_device *dinput_devices[] = HINSTANCE DINPUT_instance; -static const WCHAR di_em_win_w[] = {'D','I','E','m','W','i','n',0}; static HWND di_em_win; static BOOL check_hook_thread(void); @@ -498,7 +497,7 @@ static void register_di_em_win_class(void) class.cbSize = sizeof(class); class.lpfnWndProc = di_em_win_wndproc; class.hInstance = DINPUT_instance; - class.lpszClassName = di_em_win_w; + class.lpszClassName = L"DIEmWin"; if (!RegisterClassExW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) WARN( "Unable to register message window class\n" ); @@ -506,7 +505,7 @@ static void register_di_em_win_class(void) static void unregister_di_em_win_class(void) { - if (!UnregisterClassW( di_em_win_w, NULL ) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + if (!UnregisterClassW( L"DIEmWin", NULL ) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) WARN( "Unable to unregister message window class\n" ); } @@ -611,7 +610,7 @@ static HRESULT WINAPI IDirectInputWImpl_GetDeviceStatus( IDirectInput7W *iface, static HRESULT WINAPI IDirectInputWImpl_RunControlPanel( IDirectInput7W *iface, HWND hwndOwner, DWORD dwFlags ) { IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); - WCHAR control_exeW[] = {'c','o','n','t','r','o','l','.','e','x','e',0}; + WCHAR control_exe[] = {L"control.exe"}; STARTUPINFOW si = {0}; PROCESS_INFORMATION pi; @@ -626,7 +625,7 @@ static HRESULT WINAPI IDirectInputWImpl_RunControlPanel( IDirectInput7W *iface, if (!This->initialized) return DIERR_NOTINITIALIZED; - if (!CreateProcessW(NULL, control_exeW, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) + if (!CreateProcessW( NULL, control_exe, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) return HRESULT_FROM_WIN32(GetLastError()); return DI_OK; @@ -1294,8 +1293,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DWORD ret; MSG msg; - di_em_win = CreateWindowW( di_em_win_w, di_em_win_w, 0, 0, 0, 0, 0, - HWND_MESSAGE, 0, DINPUT_instance, NULL ); + di_em_win = CreateWindowW( L"DIEmWin", L"DIEmWin", 0, 0, 0, 0, 0, HWND_MESSAGE, 0, DINPUT_instance, NULL ); /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c6345baf53d..2280dc15040 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1812,8 +1812,6 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) { - static const WCHAR ig_w[] = {'&','I','G','_',0}; - static const WCHAR xi_w[] = {'&','X','I','_',0}; char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {.cbSize = sizeof(iface)}; @@ -1856,9 +1854,9 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W if (override) { if (!SetupDiGetDeviceInstanceIdW( set, &devinfo, device_id, MAX_PATH, NULL ) || - !(tmp = wcsstr( device_id, ig_w ))) + !(tmp = wcsstr( device_id, L"&IG_" ))) goto next; - memcpy( tmp, xi_w, sizeof(xi_w) - sizeof(WCHAR) ); + memcpy( tmp, L"&XI_", sizeof(L"&XI_") - sizeof(WCHAR) ); if (!SetupDiOpenDeviceInfoW( xi_set, device_id, NULL, 0, &devinfo )) goto next; if (!SetupDiEnumDeviceInterfaces( xi_set, &devinfo, &GUID_DEVINTERFACE_WINEXINPUT, 0, &iface )) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 34710c5cdb0..c9301bb5146 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -136,9 +136,6 @@ static HRESULT mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEIN static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseImpl **out ) { - static const WCHAR mouse_wrap_override_w[] = {'M','o','u','s','e','W','a','r','p','O','v','e','r','r','i','d','e',0}; - static const WCHAR disable_w[] = {'d','i','s','a','b','l','e',0}; - static const WCHAR force_w[] = {'f','o','r','c','e',0}; SysMouseImpl* newDevice; LPDIDATAFORMAT df = NULL; unsigned i; @@ -154,10 +151,10 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); - if (!get_config_key(hkey, appkey, mouse_wrap_override_w, buffer, sizeof(buffer))) + if (!get_config_key( hkey, appkey, L"MouseWarpOverride", buffer, sizeof(buffer) )) { - if (!wcsnicmp( buffer, disable_w, -1 )) newDevice->warp_override = WARP_DISABLE; - else if (!wcsnicmp( buffer, force_w, -1 )) newDevice->warp_override = WARP_FORCE_ON; + if (!wcsnicmp( buffer, L"disable", -1 )) newDevice->warp_override = WARP_DISABLE; + else if (!wcsnicmp( buffer, L"force", -1 )) newDevice->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); @@ -687,23 +684,19 @@ static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) { - static const WCHAR x_axisW[] = {'X','-','A','x','i','s',0}; - static const WCHAR y_axisW[] = {'Y','-','A','x','i','s',0}; - static const WCHAR wheelW[] = {'W','h','e','e','l',0}; - static const WCHAR buttonW[] = {'B','u','t','t','o','n',' ','%','d',0}; HRESULT res; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; if (IsEqualGUID( &pdidoi->guidType, &GUID_XAxis )) - wcscpy( pdidoi->tszName, x_axisW ); + wcscpy( pdidoi->tszName, L"X-Axis" ); else if (IsEqualGUID( &pdidoi->guidType, &GUID_YAxis )) - wcscpy( pdidoi->tszName, y_axisW ); + wcscpy( pdidoi->tszName, L"Y-Axis" ); else if (IsEqualGUID( &pdidoi->guidType, &GUID_ZAxis )) - wcscpy( pdidoi->tszName, wheelW ); + wcscpy( pdidoi->tszName, L"Wheel" ); else if (pdidoi->dwType & DIDFT_BUTTON) - swprintf( pdidoi->tszName, MAX_PATH, buttonW, DIDFT_GETINSTANCE( pdidoi->dwType ) - 3 ); + swprintf( pdidoi->tszName, MAX_PATH, L"Button %d", DIDFT_GETINSTANCE( pdidoi->dwType ) - 3 ); if(pdidoi->dwType & DIDFT_AXIS) pdidoi->dwFlags |= DIDOI_ASPECTPOSITION;

1 0

Rémi Bernon : dinput: Use msvcrt memory allocation functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: f5b32121b1b4480ffab50b040d42998253b7e21c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5b32121b1b4480ffab50b04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:11:00 2021 +0200 dinput: Use msvcrt memory allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 42 +++++++++++++++------------- dlls/dinput/config.c | 12 ++++---- dlls/dinput/device.c | 69 +++++++++++++++++++++------------------------- dlls/dinput/dinput_main.c | 17 +++++------- dlls/dinput/joystick_hid.c | 39 +++++++++++++------------- dlls/dinput/keyboard.c | 8 +++--- dlls/dinput/mouse.c | 8 +++--- 7 files changed, 95 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5b32121b1b4480ffab5…

1 0

Rémi Bernon : dinput: Build with msvcrt.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: e4f6ec7d3d033089e02f75924d9f86f1ef14958a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f6ec7d3d033089e02f7592… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:58 2021 +0200 dinput: Build with msvcrt. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 -- dlls/dinput/config.c | 10 +++++----- dlls/dinput/device.c | 23 ++++++++++++----------- dlls/dinput/dinput_main.c | 12 ++++++------ dlls/dinput/joystick_hid.c | 3 +-- dlls/dinput/keyboard.c | 4 ---- dlls/dinput/mouse.c | 21 +++++++++------------ dlls/dinput8/Makefile.in | 2 -- 8 files changed, 33 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4f6ec7d3d033089e02f…

1 0

Rémi Bernon : dinput: Move device_instance_is_disabled to device.c.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 46d35211203201cbe1826db98c15f488ed91a883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46d35211203201cbe1826db9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:55 2021 +0200 dinput: Move device_instance_is_disabled to device.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 48 -------------------------------------------- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d869f439101..61f6effad19 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -314,6 +314,54 @@ DWORD get_config_key( HKEY defkey, HKEY appkey, const WCHAR *name, WCHAR *buffer return ERROR_FILE_NOT_FOUND; } +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) +{ + static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; + static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; + WCHAR buffer[MAX_PATH]; + HKEY hkey, appkey, temp; + BOOL disable = FALSE; + + get_app_key( &hkey, &appkey ); + if (override) *override = FALSE; + + /* Joystick settings are in the 'joysticks' subkey */ + if (appkey) + { + if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; + RegCloseKey( appkey ); + appkey = temp; + } + + if (hkey) + { + if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; + RegCloseKey( hkey ); + hkey = temp; + } + + /* Look for the "controllername"="disabled" key */ + if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) + { + if (!strcmpW( disabled_str, buffer )) + { + TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + disable = TRUE; + } + else if (override && !strcmpW( override_str, buffer )) + { + TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + *override = TRUE; + } + } + + if (appkey) RegCloseKey( appkey ); + if (hkey) RegCloseKey( hkey ); + + return disable; +} + /* Conversion between internal data buffer and external data buffer */ void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 90eab627c26..8aced6d84dd 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -98,6 +98,7 @@ extern const IDirectInputDevice8AVtbl dinput_device_a_vtbl DECLSPEC_HIDDEN; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; +extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6e573e8741a..979d5a5c7f2 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -279,54 +279,6 @@ BOOL device_disabled_registry(const char* name) return device_instance_is_disabled( &instance, NULL ); } -BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) -{ - static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; - static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; - static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; - WCHAR buffer[MAX_PATH]; - HKEY hkey, appkey, temp; - BOOL disable = FALSE; - - get_app_key(&hkey, &appkey); - if (override) *override = FALSE; - - /* Joystick settings are in the 'joysticks' subkey */ - if (appkey) - { - if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; - RegCloseKey(appkey); - appkey = temp; - } - - if (hkey) - { - if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; - RegCloseKey(hkey); - hkey = temp; - } - - /* Look for the "controllername"="disabled" key */ - if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) - { - if (!strcmpW( disabled_str, buffer )) - { - TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - disable = TRUE; - } - else if (override && !strcmpW( override_str, buffer )) - { - TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - *override = TRUE; - } - } - - if (appkey) RegCloseKey(appkey); - if (hkey) RegCloseKey(hkey); - - return disable; -} - BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) { int i;

1 0

Robin Kertels : vkd3d: Ignore D3D12_SO_NO_RASTERIZED_STREAM when stream output is disabled.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: vkd3d Branch: master Commit: 21725c5c083be7f9652f625040c4bb34f84fbaa5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=21725c5c083be7f9652f625… Author: Robin Kertels <robin.kertels(a)gmail.com> Date: Mon Oct 11 17:55:07 2021 +0200 vkd3d: Ignore D3D12_SO_NO_RASTERIZED_STREAM when stream output is disabled. Fixes the black screen problem in Diablo 2: Resurrected. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 78b0c71..701af89 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2034,7 +2034,8 @@ static void rs_stream_info_from_d3d12(VkPipelineRasterizationStateStreamCreateIn VkPipelineRasterizationStateCreateInfo *vk_rs_desc, const D3D12_STREAM_OUTPUT_DESC *so_desc, const struct vkd3d_vulkan_info *vk_info) { - if (!so_desc->RasterizedStream || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + if (!so_desc->NumEntries || !so_desc->RasterizedStream + || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) return; if (!vk_info->rasterization_stream) @@ -2811,7 +2812,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) - || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + || (graphics->xfb_enabled && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info);

1 0

Conor McCarthy : tests: Use D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER for constant buffers in test_unbounded_resource_arrays().
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: vkd3d Branch: master Commit: 8fbe785c11f642c1c569195fa73f1d1d1c73f272 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8fbe785c11f642c1c569195… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 11 17:55:06 2021 +0200 tests: Use D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER for constant buffers in test_unbounded_resource_arrays(). Signed-off-by: Conor McCarthy <cmccarthy(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 4991dd5..38fab13 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34940,7 +34940,7 @@ static void test_unbounded_resource_arrays(void) upload_buffer_data(constant_buffers[i], 0, sizeof(cb_data), &cb_data, queue, command_list); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, constant_buffers[i], - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER); cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(constant_buffers[i]); cbv_desc.SizeInBytes = align(sizeof(cb_data), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT);

1 0

Conor McCarthy : tests: Use a bounded range between unbounded ranges in test_unbounded_resource_arrays().
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: vkd3d Branch: master Commit: 58b52f6950e1f2a0b5ff145f7379ce6dde010670 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=58b52f6950e1f2a0b5ff145… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 11 17:55:05 2021 +0200 tests: Use a bounded range between unbounded ranges in test_unbounded_resource_arrays(). Signed-off-by: Conor McCarthy <cmccarthy(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, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index cc06b13..4991dd5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34855,7 +34855,7 @@ static void test_unbounded_resource_arrays(void) {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, UINT_MAX, 2, 1, 0}, {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, UINT_MAX, 2, 1, 64}, {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 1, 128}, - {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 2, 127}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, 65, 1, 2, 127}, {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 3, 192}, }; @@ -34999,7 +34999,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 74) + todo_if(i != 74 && i > 63) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator);

1 0

Conor McCarthy : vkd3d-shader/spirv: Add non-uniform decorations.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: vkd3d Branch: master Commit: 821bb0c5cf956cce6c1ab42f03d493075a1df576 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=821bb0c5cf956cce6c1ab42… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 11 17:55:04 2021 +0200 vkd3d-shader/spirv: Add non-uniform decorations. Based in part on vkd3d-proton patches by Philip Rebohle and Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(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 ++++++++++++++++++++++++++++--- tests/d3d12.c | 3 +-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0be17e3..ebaf163 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1838,7 +1838,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) - || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityShaderNonUniformEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) @@ -2670,6 +2671,15 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxb vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } +static void vkd3d_dxbc_compiler_decorate_nonuniform(struct vkd3d_dxbc_compiler *compiler, + uint32_t expression_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityShaderNonUniformEXT); + vkd3d_spirv_build_op_decorate(builder, expression_id, SpvDecorationNonUniformEXT, NULL, 0); +} + static const struct vkd3d_symbol *vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_symbol *symbol) { @@ -3314,6 +3324,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id); register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id, indexes, index_count); + if (reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, register_info->id); } } @@ -7993,8 +8005,16 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil return; } - image->image_id = load ? vkd3d_spirv_build_op_load(builder, - image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; + if (load) + { + image->image_id = vkd3d_spirv_build_op_load(builder, image->image_type_id, image->id, SpvMemoryAccessMaskNone); + if (resource_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, image->image_id); + } + else + { + image->image_id = 0; + } image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, &symbol->info.resource.range, image->resource_type_info, @@ -8023,9 +8043,14 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); + if (sampler_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, sampler_id); + sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, sampled_image_type_id, image->image_id, sampler_id); + if (resource_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, image->sampled_image_id); } else { diff --git a/tests/d3d12.c b/tests/d3d12.c index efdf0b4..cc06b13 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34999,7 +34999,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 10 && i != 74) + todo_if(i != 74) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -35146,7 +35146,6 @@ static void test_unbounded_samplers(void) { unsigned int value = get_readback_uint(&rb, i, 0, 0); unsigned int expected = (i & 1) ? 100 : 10; - todo_if(i & 1) ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); } release_resource_readback(&rb);

1 0

Alexandre Julliard : Wine release 6.19
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: website Branch: master Commit: 64582f7275ef4c80973fb379cd2ba977ea2950fe URL: https://source.winehq.org/git/website.git/?a=commit;h=64582f7275ef4c80973fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 21:12:44 2021 +0200 Wine release 6.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021100801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021100801.xml b/news/en/2021100801.xml new file mode 100644 index 00000000..458d04fb --- /dev/null +++ b/news/en/2021100801.xml @@ -0,0 +1,17 @@ +<news> +<date>October 8, 2021</date> +<title>Wine 6.19 Released</title> +<body> + The Wine development release 6.19 is now available. + <a href="{$root}/announce/6.19">What's new</a> in this release: +<ul> + <li>IPHlpApi, NsiProxy, WineDbg and a few other modules converted to PE.</li> + <li>More HID joystick work.</li> + <li>Kernel parts of GDI moved to Win32u.</li> + <li>More work towards Dwarf 3/4 debug support.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.19.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-6.19 : Alexandre Julliard : Release 6.19
by Alexandre Julliard Oct. 8, 2021

Oct. 8, 2021

Module: wine Branch: refs/tags/wine-6.19 Tag: f2146d984489115ee8a1a596bb0ea1ddd7339267 URL: https://source.winehq.org/git/wine.git/?a=tag;h=f2146d984489115ee8a1a596bb0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 21:10:44 2021 +0200 Release 6.19

1 0