wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : dinput: Remove legacy joystick backends.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: adfee25b45af8160848f94fdb24279d63d5f91f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adfee25b45af8160848f94fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:57 2021 +0200 dinput: Remove legacy joystick backends. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 - configure.ac | 1 - dlls/dinput/Makefile.in | 6 - dlls/dinput/device.c | 34 +- dlls/dinput/device_private.h | 27 - dlls/dinput/dinput_main.c | 3 - dlls/dinput/dinput_private.h | 3 - dlls/dinput/effect_linuxinput.c | 906 -------------------- dlls/dinput/joystick.c | 962 --------------------- dlls/dinput/joystick_hid.c | 8 +- dlls/dinput/joystick_linux.c | 831 ------------------ dlls/dinput/joystick_linuxinput.c | 1276 --------------------------- dlls/dinput/joystick_osx.c | 1704 ------------------------------------- dlls/dinput/joystick_private.h | 91 -- dlls/dinput8/Makefile.in | 6 - 15 files changed, 6 insertions(+), 5856 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adfee25b45af8160848f…

1 0

Rémi Bernon : dinput: Move PIDVID internal guid to device.c.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 7011685e1e705eacae8d46dd0ddec651cf140da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7011685e1e705eacae8d46dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 11 10:10:56 2021 +0200 dinput: Move PIDVID internal guid 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 | 9 +++++++++ dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick.c | 8 -------- dlls/dinput/joystick_hid.c | 6 +++--- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 61f6effad19..484fe904c2e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -36,6 +36,9 @@ #include "winuser.h" #include "winerror.h" #include "dinput.h" +#include "dinputd.h" + +#include "initguid.h" #include "device_private.h" #include "dinput_private.h" @@ -43,6 +46,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. + * Data1 contains the device VID (low word) and PID (high word). + * Data4 ends with the ASCII bytes "PIDVID". + */ +DEFINE_GUID( dinput_pidvid_guid, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D' ); + static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 8aced6d84dd..2b939fd5a0c 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -128,7 +128,7 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -extern const GUID DInput_PIDVID_Product_GUID DECLSPEC_HIDDEN; +extern const GUID dinput_pidvid_guid DECLSPEC_HIDDEN; /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 979d5a5c7f2..afebaa022b7 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -52,14 +52,6 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x0719, /* Xbox 360 Wireless Adapter */ }; -/* Windows uses this GUID for guidProduct on non-keyboard/mouse devices. - * Data1 contains the device VID (low word) and PID (high word). - * Data4 ends with the ASCII bytes "PIDVID". - */ -const GUID DInput_PIDVID_Product_GUID = { /* device_pidvid-0000-0000-0000-504944564944 */ - 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} -}; - static inline JoystickGenericImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 728b98591d2..63193554405 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1737,7 +1737,7 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND instance->guidInstance = hid_joystick_guid; instance->guidInstance.Data1 ^= handle; - instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct = dinput_pidvid_guid; instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); instance->guidFFDriver = GUID_NULL; instance->wUsagePage = caps->UsagePage; @@ -2258,9 +2258,9 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); *out = NULL; - instance.guidProduct.Data1 = DInput_PIDVID_Product_GUID.Data1; + instance.guidProduct.Data1 = dinput_pidvid_guid.Data1; instance.guidInstance.Data1 = hid_joystick_guid.Data1; - if (IsEqualGUID( &DInput_PIDVID_Product_GUID, &instance.guidProduct )) + if (IsEqualGUID( &dinput_pidvid_guid, &instance.guidProduct )) instance.guidProduct = *guid; else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) instance.guidInstance = *guid; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5b54e352c20..decd69b1e7e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -315,7 +315,7 @@ static INT find_joystick_devices(void) else { /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_PIDVID_Product_GUID; + joydev.guid_product = dinput_pidvid_guid; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 949fd1da081..c7f4cc486fd 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -320,7 +320,7 @@ static void find_joydevs(void) joydev.bus_type = device_id.bustype; /* Concatenate product_id with vendor_id to mimic Windows behaviour */ - joydev.guid_product = DInput_PIDVID_Product_GUID; + joydev.guid_product = dinput_pidvid_guid; joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 9ee45e8a445..5796daf8e11 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1058,7 +1058,7 @@ static HRESULT joydev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINST /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_PIDVID_Product_GUID; + lpddi->guidProduct = dinput_pidvid_guid; lpddi->guidProduct.Data1 = make_vid_pid(device); lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; @@ -1131,7 +1131,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, JoystickIm newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; - newDevice->generic.guidProduct = DInput_PIDVID_Product_GUID; + newDevice->generic.guidProduct = dinput_pidvid_guid; newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state; @@ -1309,7 +1309,7 @@ static unsigned short get_joystick_index(REFGUID guid) if(IsEqualGUID(&wine_joystick, &dev_guid)) return guid->Data3; prod_guid.Data1 = 0; - if(IsEqualGUID(&DInput_PIDVID_Product_GUID, &prod_guid)) + if(IsEqualGUID(&dinput_pidvid_guid, &prod_guid)) { joystick_devices_count = find_joystick_devices(); for(i = 0; i < joystick_devices_count; i++)

1 0

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

11 Oct '21

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

Huw Davies : maintainers: Update GDI files.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 7d4d3944d66e326444b3a8d42972bf0bd68e0f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4d3944d66e326444b3a8d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 11 09:41:21 2021 +0100 maintainers: Update GDI files. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..5bf636cfd34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -129,6 +129,26 @@ F: dlls/mscoree/ GDI M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ +F: dlls/win32u/bitblt.c +F: dlls/win32u/bitmap.c +F: dlls/win32u/brush.c +F: dlls/win32u/clipping.c +F: dlls/win32u/dc.c +F: dlls/win32u/dib.c +F: dlls/win32u/dibdrv/ +F: dlls/win32u/driver.c +F: dlls/win32u/emfdrv.c +F: dlls/win32u/font.c +F: dlls/win32u/freetype.c +F: dlls/win32u/gdiobj.c +F: dlls/win32u/mapping.c +F: dlls/win32u/opentype.c +F: dlls/win32u/painting.c +F: dlls/win32u/palette.c +F: dlls/win32u/path.c +F: dlls/win32u/pen.c +F: dlls/win32u/printdrv.c +F: dlls/win32u/region.c GDIPlus M: Esme Povirk <vincent(a)codeweavers.com>

1 0

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

11 Oct '21

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 11 Oct '21

11 Oct '21

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 11 Oct '21

11 Oct '21

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 11 Oct '21

11 Oct '21

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 08 Oct '21

08 Oct '21

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 08 Oct '21

08 Oct '21

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021