September 2019 - Wine-commits

Alistair Leslie-Hughes : bcrypt: Fix key_asymmetric_init function for macos.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: e95215d08c8dedf6432994d6fde49c4e90457f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95215d08c8dedf6432994d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 24 12:52:59 2019 +0000 bcrypt: Fix key_asymmetric_init function for macos. Regression introduced in 98b230f851f859e9240e8381e3deec5016082ceb Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/macos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 0f7b14ff95..fbd0321021 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -200,7 +200,7 @@ NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, ULONG bitl } NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, - ULONG output_len, ULONG *ret_len ) + ULONG output_len, ULONG *ret_len, ULONG flags ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED;

1 0

Jacek Caban : ole32: Lock spies list when iterating it.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: d449b617e78882df205cb0350176a1d3115f244b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d449b617e78882df205cb035… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 24 15:56:38 2019 +0200 ole32: Lock spies list when iterating it. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 65 +++++++++++++++++++++++++++++++++----------- dlls/ole32/compobj_private.h | 1 + 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a3e84929bd..c5a36059b9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1744,7 +1744,7 @@ static void COM_TlsDestroy(void) LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &info->spies, struct init_spy, entry) { list_remove(&cursor->entry); - IInitializeSpy_Release(cursor->spy); + if (cursor->spy) IInitializeSpy_Release(cursor->spy); heap_free(cursor); } @@ -1777,13 +1777,36 @@ static struct init_spy *get_spy_entry(struct oletls *info, unsigned int id) LIST_FOR_EACH_ENTRY(spy, &info->spies, struct init_spy, entry) { - if (id == spy->id) + if (id == spy->id && spy->spy) return spy; } return NULL; } +/* + * When locked, don't modify list (unless we add a new head), so that it's + * safe to iterate it. Freeing of list entries is delayed and done on unlock. + */ +static inline void lock_init_spies(struct oletls *info) +{ + info->spies_lock++; +} + +static void unlock_init_spies(struct oletls *info) +{ + struct init_spy *spy, *next; + + if (--info->spies_lock) return; + + LIST_FOR_EACH_ENTRY_SAFE(spy, next, &info->spies, struct init_spy, entry) + { + if (spy->spy) continue; + list_remove(&spy->entry); + heap_free(spy); + } +} + /****************************************************************************** * CoRegisterInitializeSpy [OLE32.@] * @@ -1869,16 +1892,16 @@ HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) if (!info || cookie.HighPart != GetCurrentThreadId()) return E_INVALIDARG; - if ((spy = get_spy_entry(info, cookie.LowPart))) + if (!(spy = get_spy_entry(info, cookie.LowPart))) return E_INVALIDARG; + + IInitializeSpy_Release(spy->spy); + spy->spy = NULL; + if (!info->spies_lock) { - IInitializeSpy_Release(spy->spy); list_remove(&spy->entry); heap_free(spy); - - return S_OK; } - - return E_INVALIDARG; + return S_OK; } HRESULT enter_apartment( struct oletls *info, DWORD model ) @@ -2000,17 +2023,21 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni RunningObjectTableImpl_Initialize(); } + lock_init_spies(info); LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) { - IInitializeSpy_PreInitialize(cursor->spy, dwCoInit, info->inits); + if (cursor->spy) IInitializeSpy_PreInitialize(cursor->spy, dwCoInit, info->inits); } + unlock_init_spies(info); hr = enter_apartment( info, dwCoInit ); + lock_init_spies(info); LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) { - hr = IInitializeSpy_PostInitialize(cursor->spy, hr, dwCoInit, info->inits); + if (cursor->spy) hr = IInitializeSpy_PostInitialize(cursor->spy, hr, dwCoInit, info->inits); } + unlock_init_spies(info); return hr; } @@ -2034,7 +2061,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { struct oletls * info = COM_CurrentInfo(); - struct init_spy *cursor; + struct init_spy *cursor, *next; LONG lCOMRefCnt; TRACE("()\n"); @@ -2042,20 +2069,24 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) /* will only happen on OOM */ if (!info) return; - LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) + lock_init_spies(info); + LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &info->spies, struct init_spy, entry) { - IInitializeSpy_PreUninitialize(cursor->spy, info->inits); + if (cursor->spy) IInitializeSpy_PreUninitialize(cursor->spy, info->inits); } + unlock_init_spies(info); /* sanity check */ if (!info->inits) { ERR("Mismatched CoUninitialize\n"); - LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) + lock_init_spies(info); + LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &info->spies, struct init_spy, entry) { - IInitializeSpy_PostUninitialize(cursor->spy, info->inits); + if (cursor->spy) IInitializeSpy_PostUninitialize(cursor->spy, info->inits); } + unlock_init_spies(info); return; } @@ -2080,10 +2111,12 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) InterlockedExchangeAdd(&s_COMLockCount,1); /* restore the lock count. */ } + lock_init_spies(info); LIST_FOR_EACH_ENTRY(cursor, &info->spies, struct init_spy, entry) { - IInitializeSpy_PostUninitialize(cursor->spy, info->inits); + if (cursor->spy) IInitializeSpy_PostUninitialize(cursor->spy, info->inits); } + unlock_init_spies(info); } /****************************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 8bf3d6fc81..bda1c6bff2 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -179,6 +179,7 @@ struct oletls DWORD unknown2[46]; IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ struct list spies; /* Spies installed with CoRegisterInitializeSpy */ + DWORD spies_lock; };

1 0

Jacek Caban : ole32/tests: Add more initialization spies tests.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 895c77ef73ec4c19ff3f62f39f57b2af8be55b11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=895c77ef73ec4c19ff3f62f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 24 15:56:48 2019 +0200 ole32/tests: Add more initialization spies tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 182 +++++++++++++++++++++++++++++++++------------ 1 file changed, 134 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=895c77ef73ec4c19ff3f…

1 0

Piotr Caban : mountmgr.sys: Null terminate serial_search_paths and parallel_search_paths tables.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 93ea9713c2256d1f306fc37af67da34ec92fdf56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ea9713c2256d1f306fc37a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 16:14:55 2019 +0200 mountmgr.sys: Null terminate serial_search_paths and parallel_search_paths tables. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6604b69ef8..22a9e69dd9 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1161,16 +1161,14 @@ static void create_port_devices( DRIVER_OBJECT *driver ) "/dev/cuau%u", #elif defined(__DragonFly__) "/dev/cuaa%u", -#else - "", #endif + NULL }; static const char *parallel_search_paths[] = { #ifdef linux "/dev/lp%u", -#else - "", #endif + NULL }; static const WCHAR serialcomm_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -1183,7 +1181,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) char *dosdevices_path, *p; HKEY wine_ports_key = NULL, windows_ports_key = NULL; char unix_path[256]; - int num_search_paths, i, j, n; + int i, j, n; if (!(dosdevices_path = get_dosdevices_path( &p ))) return; @@ -1194,7 +1192,6 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'o'; p[2] = 'm'; search_paths = serial_search_paths; - num_search_paths = ARRAY_SIZE(serial_search_paths); windows_ports_key_name = serialcomm_keyW; } else @@ -1203,7 +1200,6 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'p'; p[2] = 't'; search_paths = parallel_search_paths; - num_search_paths = ARRAY_SIZE(parallel_search_paths); windows_ports_key_name = parallel_ports_keyW; } p += 3; @@ -1223,7 +1219,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) /* look for ports in the usual places */ n = 1; - for (i = 0; i < num_search_paths; i++) + for (i = 0; search_paths[i]; i++) { for (j = 0; n <= MAX_PORTS; j++) {

1 0

Piotr Caban : mountmgr.sys: Always add all user-defined ports.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 38b30a593ef1297d975cc400f8e136c9be8a0a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38b30a593ef1297d975cc400… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 16:15:00 2019 +0200 mountmgr.sys: Always add all user-defined ports. Makes it possible to define non-consecutive COM ports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 67 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 22a9e69dd9..e77f890404 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1066,8 +1066,8 @@ NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *pa /* create a serial or parallel port */ -static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_path, const char *dosdevices_path, char *p, - HKEY wine_ports_key, HKEY windows_ports_key ) +static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_path, + const char *dosdevices_path, HKEY windows_ports_key ) { static const WCHAR comW[] = {'C','O','M','%','u',0}; static const WCHAR lptW[] = {'L','P','T','%','u',0}; @@ -1079,8 +1079,6 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p static const WCHAR dosdevices_prnW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','P','R','N',0}; const WCHAR *dos_name_format, *nt_name_format, *reg_value_format, *symlink_format, *default_device; WCHAR dos_name[7], reg_value[256], nt_buffer[32], symlink_buffer[32]; - DWORD type, size; - char override_path[256]; UNICODE_STRING nt_name, symlink_name, default_name; DEVICE_OBJECT *dev_obj; NTSTATUS status; @@ -1104,20 +1102,8 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p sprintfW( dos_name, dos_name_format, n ); - /* check for override */ - size = sizeof(reg_value); - if (RegQueryValueExW( wine_ports_key, dos_name, NULL, &type, (BYTE *)reg_value, &size ) == 0 && type == REG_SZ) - { - if (!reg_value[0] || !WideCharToMultiByte( CP_UNIXCP, WC_ERR_INVALID_CHARS, reg_value, size/sizeof(WCHAR), - override_path, sizeof(override_path), NULL, NULL)) - return FALSE; - unix_path = override_path; - } - if (!unix_path) - return FALSE; - /* create DOS device */ - sprintf( p, "%u", n ); + unlink( dosdevices_path ); if (symlink( unix_path, dosdevices_path ) != 0) return FALSE; @@ -1176,11 +1162,18 @@ static void create_port_devices( DRIVER_OBJECT *driver ) static const WCHAR parallel_ports_keyW[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'P','A','R','A','L','L','E','L',' ','P','O','R','T','S',0}; + static const WCHAR comW[] = {'C','O','M'}; + static const WCHAR lptW[] = {'L','P','T'}; const char **search_paths; const WCHAR *windows_ports_key_name; char *dosdevices_path, *p; HKEY wine_ports_key = NULL, windows_ports_key = NULL; char unix_path[256]; + const WCHAR *port_prefix; + WCHAR reg_value[256]; + BOOL used[MAX_PORTS]; + WCHAR port[7]; + DWORD port_len, type, size; int i, j, n; if (!(dosdevices_path = get_dosdevices_path( &p ))) @@ -1193,6 +1186,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[2] = 'm'; search_paths = serial_search_paths; windows_ports_key_name = serialcomm_keyW; + port_prefix = comW; } else { @@ -1201,6 +1195,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[2] = 't'; search_paths = parallel_search_paths; windows_ports_key_name = parallel_ports_keyW; + port_prefix = lptW; } p += 3; @@ -1209,16 +1204,34 @@ static void create_port_devices( DRIVER_OBJECT *driver ) RegCreateKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &windows_ports_key, NULL ); - /* remove old symlinks */ - for (n = 1; n <= MAX_PORTS; n++) + /* add user-defined serial ports */ + memset(used, 0, sizeof(used)); + for (i = 0; ; i++) { - sprintf( p, "%u", n ); - if (unlink( dosdevices_path ) != 0 && errno == ENOENT) + port_len = ARRAY_SIZE(port); + size = sizeof(reg_value); + if (RegEnumValueW( wine_ports_key, i, port, &port_len, NULL, + &type, (BYTE*)reg_value, &size ) != ERROR_SUCCESS) break; + if (type != REG_SZ || strncmpiW( port, port_prefix, 3 )) + continue; + + n = atolW( port + 3 ); + if (n < 1 || n >= MAX_PORTS) + continue; + + if (!WideCharToMultiByte( CP_UNIXCP, WC_ERR_INVALID_CHARS, reg_value, size/sizeof(WCHAR), + unix_path, sizeof(unix_path), NULL, NULL)) + continue; + + used[n - 1] = TRUE; + sprintf( p, "%u", n ); + create_port_device( driver, n, unix_path, dosdevices_path, windows_ports_key ); } /* look for ports in the usual places */ n = 1; + while (n <= MAX_PORTS && used[n - 1]) n++; for (i = 0; search_paths[i]; i++) { for (j = 0; n <= MAX_PORTS; j++) @@ -1227,19 +1240,13 @@ static void create_port_devices( DRIVER_OBJECT *driver ) if (access( unix_path, F_OK ) != 0) break; - create_port_device( driver, n, unix_path, dosdevices_path, p, wine_ports_key, windows_ports_key ); + sprintf( p, "%u", n ); + create_port_device( driver, n, unix_path, dosdevices_path, windows_ports_key ); n++; + while (n <= MAX_PORTS && used[n - 1]) n++; } } - /* add any extra user-defined serial ports */ - while (n <= MAX_PORTS) - { - if (!create_port_device( driver, n, NULL, dosdevices_path, p, wine_ports_key, windows_ports_key )) - break; - n++; - } - RegCloseKey( wine_ports_key ); RegCloseKey( windows_ports_key ); HeapFree( GetProcessHeap(), 0, dosdevices_path );

1 0

Henri Verbeet : wined3d: Merge wined3d_buffer_gl_map() and buffer_resource_sub_resource_map().
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: e0dcdaedb21763bf5e7752fdff8252696b3f2f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0dcdaedb21763bf5e7752fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:40 2019 +0330 wined3d: Merge wined3d_buffer_gl_map() and buffer_resource_sub_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 129 ++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b8c5117f89..9566d1c440 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -964,19 +964,40 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } -static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, - unsigned int offset, unsigned int size, BYTE **data, DWORD flags) +static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { - struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_buffer *buffer = buffer_from_resource(resource); + struct wined3d_device *device = resource->device; struct wined3d_context *context; + unsigned int offset, size; + uint8_t *base; LONG count; - BYTE *base; - TRACE("buffer_gl %p, offset %u, size %u, data %p, flags %#x.\n", buffer_gl, offset, size, data, flags); + TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", + resource, sub_resource_idx, map_desc, debug_box(box), flags); + + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } + + if (box) + { + offset = box->left; + size = box->right - box->left; + } + else + { + offset = size = 0; + } + + map_desc->row_pitch = map_desc->slice_pitch = resource->size; - count = ++buffer_gl->b.resource.map_count; + count = ++resource->map_count; - if (buffer_gl->b.buffer_object) + if (buffer->buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; struct wined3d_bo_address addr; @@ -992,36 +1013,36 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) - || buffer_gl->b.flags & WINED3D_BUFFER_PIN_SYSMEM) + || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { - if (!(buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); context_release(context); } if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(&buffer_gl->b, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } else { context = context_acquire(device, NULL, 0); if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); else - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); if (flags & WINED3D_MAP_WRITE) { - wined3d_buffer_invalidate_location(&buffer_gl->b, WINED3D_LOCATION_SYSMEM); - buffer_invalidate_bo_range(&buffer_gl->b, dirty_offset, dirty_size); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); } - if ((flags & WINED3D_MAP_DISCARD) && buffer_gl->b.resource.heap_memory) - wined3d_buffer_evict_sysmem(&buffer_gl->b); + if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) + wined3d_buffer_evict_sysmem(buffer); if (count == 1) { @@ -1032,40 +1053,39 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, * buffer. The r600g driver only does this when the buffer is * currently in use, while the proprietary NVIDIA driver * appears to do this unconditionally. */ - if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) + if (buffer->flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - wined3d_buffer_gl_sync_apple(buffer_gl, flags, wined3d_context_gl(context)); + if (buffer->flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(wined3d_buffer_gl(buffer), flags, wined3d_context_gl(context)); - addr.buffer_object = buffer_gl->b.buffer_object; + addr.buffer_object = buffer->buffer_object; addr.addr = 0; - buffer_gl->b.map_ptr = wined3d_context_map_bo_address(context, &addr, - buffer_gl->b.resource.size, buffer_gl->b.resource.bind_flags, flags); + buffer->map_ptr = wined3d_context_map_bo_address(context, + &addr, resource->size, resource->bind_flags, flags); - if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - wined3d_context_unmap_bo_address(context, &addr, buffer_gl->b.resource.bind_flags, 0, NULL); - buffer_gl->b.map_ptr = NULL; + wined3d_context_unmap_bo_address(context, &addr, resource->bind_flags, 0, NULL); + buffer->map_ptr = NULL; - if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) + if (resource->usage & WINED3DUSAGE_DYNAMIC) { - /* The extra copy is more expensive than not using VBOs at - * all on the Nvidia Linux driver, which is the only driver - * that returns unaligned pointers. - */ + /* The extra copy is more expensive than not using VBOs + * at all on the NVIDIA Linux driver, which is the + * only driver that returns unaligned pointers. */ TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(&buffer_gl->b); + wined3d_buffer_drop_bo(buffer); } else { TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); - buffer_gl->b.flags |= WINED3D_BUFFER_PIN_SYSMEM; + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } - TRACE("New pointer is %p.\n", buffer_gl->b.resource.heap_memory); + TRACE("New pointer is %p.\n", resource->heap_memory); } } @@ -1073,14 +1093,13 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } if (flags & WINED3D_MAP_DISCARD) - buffer_gl->b.flags |= WINED3D_BUFFER_DISCARD; + buffer->flags |= WINED3D_BUFFER_DISCARD; } - base = buffer_gl->b.map_ptr ? buffer_gl->b.map_ptr : buffer_gl->b.resource.heap_memory; - *data = base + offset; + base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory; + map_desc->data = base + offset; - TRACE("Returning memory at %p (base %p, offset %u).\n", *data, base, offset); - /* TODO: check Flags compatibility with buffer->currentDesc.Usage (see MSDN) */ + TRACE("Returning memory at %p (base %p, offset %u).\n", map_desc->data, base, offset); return WINED3D_OK; } @@ -1230,32 +1249,6 @@ static void buffer_resource_preload(struct wined3d_resource *resource) context_release(context); } -static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) -{ - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); - UINT offset, size; - - if (sub_resource_idx) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return E_INVALIDARG; - } - - if (box) - { - offset = box->left; - size = box->right - box->left; - } - else - { - offset = size = 0; - } - - map_desc->row_pitch = map_desc->slice_pitch = resource->size; - return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); -} - static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { if (sub_resource_idx)

1 0

Henri Verbeet : wined3d: Merge wined3d_buffer_gl_unmap() and buffer_resource_sub_resource_unmap().
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: c01433690d4f1eb35126466cc0f949b17819efba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01433690d4f1eb35126466c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:41 2019 +0330 wined3d: Merge wined3d_buffer_gl_unmap() and buffer_resource_sub_resource_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 91 ++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9566d1c440..b8f985e8e4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1104,64 +1104,71 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc return WINED3D_OK; } -static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) +static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { - ULONG i; + struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int range_count = buffer->modified_areas; + struct wined3d_device *device = resource->device; + struct wined3d_context *context; + struct wined3d_bo_address addr; + + TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - TRACE("buffer_gl %p.\n", buffer_gl); + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } - /* In the case that the number of Unmap calls > the - * number of Map calls, d3d returns always D3D_OK. - * This is also needed to prevent Map from returning garbage on - * the next call (this will happen if the lock_count is < 0). */ - if (!buffer_gl->b.resource.map_count) + if (!resource->map_count) { WARN("Unmap called without a previous map call.\n"); - return; + return WINED3D_OK; } - if (--buffer_gl->b.resource.map_count) + if (--resource->map_count) { - /* Delay loading the buffer until everything is unlocked */ + /* Delay loading the buffer until everything is unmapped. */ TRACE("Ignoring unmap.\n"); - return; + return WINED3D_OK; } - if (buffer_gl->b.map_ptr) + if (!buffer->map_ptr) + return WINED3D_OK; + + context = context_acquire(device, NULL, 0); + + if (buffer->flags & WINED3D_BUFFER_APPLESYNC) { - struct wined3d_device *device = buffer_gl->b.resource.device; - unsigned int range_count = buffer_gl->b.modified_areas; - const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_context *context; - struct wined3d_bo_address addr; + const struct wined3d_gl_info *gl_info; + struct wined3d_buffer_gl *buffer_gl; + unsigned int i; - context = context_acquire(device, NULL, 0); + buffer_gl = wined3d_buffer_gl(buffer); context_gl = wined3d_context_gl(context); gl_info = context_gl->gl_info; - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_bind(buffer_gl, context_gl); + for (i = 0; i < range_count; ++i) { - wined3d_buffer_gl_bind(buffer_gl, context_gl); - for (i = 0; i < range_count; ++i) - { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, - buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); - } - range_count = 0; + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, + buffer->maps[i].offset, buffer->maps[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); } + range_count = 0; + } - addr.buffer_object = buffer_gl->b.buffer_object; - addr.addr = 0; - wined3d_context_unmap_bo_address(context, &addr, - buffer_gl->b.resource.bind_flags, range_count, buffer_gl->b.maps); + addr.buffer_object = buffer->buffer_object; + addr.addr = 0; + wined3d_context_unmap_bo_address(context, &addr, resource->bind_flags, range_count, buffer->maps); - context_release(context); + context_release(context); - buffer_clear_dirty_areas(&buffer_gl->b); - buffer_gl->b.map_ptr = NULL; - } + buffer_clear_dirty_areas(buffer); + buffer->map_ptr = NULL; + + return WINED3D_OK; } void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, @@ -1249,18 +1256,6 @@ static void buffer_resource_preload(struct wined3d_resource *resource) context_release(context); } -static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) -{ - if (sub_resource_idx) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return E_INVALIDARG; - } - - wined3d_buffer_gl_unmap(wined3d_buffer_gl(buffer_from_resource(resource))); - return WINED3D_OK; -} - static const struct wined3d_resource_ops buffer_resource_ops = { buffer_resource_incref,

1 0

Henri Verbeet : wined3d: Make the adapter responsible for clearing UAVs.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: f2c668e7797078799deecd7ed1e074402d52a2ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c668e7797078799deecd7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:42 2019 +0330 wined3d: Make the adapter responsible for clearing UAVs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 10 ++++++++++ dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/view.c | 15 +++++++-------- dlls/wined3d/wined3d_private.h | 6 ++++-- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 03799b6aa8..e161f7261b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5073,6 +5073,15 @@ static void adapter_gl_flush_context(struct wined3d_context *context) context_gl->gl_info->gl_ops.gl.p_glFlush(); } +void adapter_gl_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + + wined3d_unordered_access_view_gl_clear_uint(wined3d_unordered_access_view_gl(view), + clear_value, wined3d_context_gl(context)); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5103,6 +5112,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_create_query, adapter_gl_destroy_query, adapter_gl_flush_context, + adapter_gl_clear_uav, }; static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_gl, uint32_t wined3d_creation_flags) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 91a81b47e6..0d83cf7582 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -802,6 +802,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +void adapter_vk_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + FIXME("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -832,6 +838,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_create_query, adapter_vk_destroy_query, adapter_vk_flush_context, + adapter_vk_clear_uav, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 044d586b29..ec17b59d71 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2424,7 +2424,7 @@ static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, c struct wined3d_context *context; context = context_acquire(cs->device, NULL, 0); - wined3d_unordered_access_view_clear_uint(view, &op->clear_value, context); + cs->device->adapter->adapter_ops->adapter_clear_uav(context, view, &op->clear_value); context_release(context); wined3d_resource_release(view->resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2c3d2787bc..24fab8491a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2607,6 +2607,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +void adapter_no3d_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2637,6 +2643,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_create_query, adapter_no3d_destroy_query, adapter_no3d_flush_context, + adapter_no3d_clear_uav, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0b4c296f17..f7bb18934f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -995,17 +995,16 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ wined3d_view_invalidate_location(view->resource, &view->desc, location); } -void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, - const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) +void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_format_gl *format; struct wined3d_buffer_gl *buffer_gl; struct wined3d_resource *resource; unsigned int offset, size; - resource = view->resource; + resource = view_gl->v.resource; if (resource->type != WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); @@ -1018,7 +1017,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi return; } - format = wined3d_format_gl(view->format); + format = wined3d_format_gl(view_gl->v.format); if (format->f.id != WINED3DFMT_R32_UINT && format->f.id != WINED3DFMT_R32_SINT && format->f.id != WINED3DFMT_R32G32B32A32_UINT && format->f.id != WINED3DFMT_R32G32B32A32_SINT) @@ -1028,10 +1027,10 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi } buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); - get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); + get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15a272db17..648e3f0dee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2851,6 +2851,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_clear_uav)(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; /* The adapter structure */ @@ -4377,8 +4379,6 @@ struct wined3d_unordered_access_view }; void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN; -void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, - const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, @@ -4399,6 +4399,8 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); } +void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the adapter responsible for copying between buffer objects.
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 422fa49668a0b151a830cf673706e5c628bd7c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=422fa49668a0b151a830cf67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:43 2019 +0330 wined3d: Make the adapter responsible for copying between buffer objects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 15 +++++++++++++++ dlls/wined3d/adapter_vk.c | 19 +++++++++++++++++++ dlls/wined3d/buffer.c | 5 ++--- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++++++++++ 5 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e161f7261b..ed1022030b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4611,6 +4611,20 @@ static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const s wined3d_context_gl_unmap_bo_address(context_gl, data, binding, range_count, ranges); } +static void adapter_gl_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + struct wined3d_context_gl *context_gl; + GLenum dst_binding, src_binding; + + context_gl = wined3d_context_gl(context); + dst_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, dst_bind_flags); + src_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, src_bind_flags); + + wined3d_context_gl_copy_bo_address(context_gl, dst, dst_binding, src, src_binding, size); +} + static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -5095,6 +5109,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_uninit_3d, adapter_gl_map_bo_address, adapter_gl_unmap_bo_address, + adapter_gl_copy_bo_address, adapter_gl_create_swapchain, adapter_gl_destroy_swapchain, adapter_gl_create_buffer, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0d83cf7582..21163a2094 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -490,6 +490,24 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s ERR("Unsupported buffer object %#lx.\n", data->buffer_object); } +static void adapter_vk_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + struct wined3d_map_range range; + void *dst_ptr, *src_ptr; + + src_ptr = adapter_vk_map_bo_address(context, src, size, src_bind_flags, WINED3D_MAP_READ); + dst_ptr = adapter_vk_map_bo_address(context, dst, size, dst_bind_flags, WINED3D_MAP_WRITE); + + memcpy(dst_ptr, src_ptr, size); + + range.offset = 0; + range.size = size; + adapter_vk_unmap_bo_address(context, dst, dst_bind_flags, 1, &range); + adapter_vk_unmap_bo_address(context, src, src_bind_flags, 0, NULL); +} + static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -821,6 +839,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_uninit_3d, adapter_vk_map_bo_address, adapter_vk_unmap_bo_address, + adapter_vk_copy_bo_address, adapter_vk_create_swapchain, adapter_vk_destroy_swapchain, adapter_vk_create_buffer, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b8f985e8e4..18a0d72117 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1188,9 +1188,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), - &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, - &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); + wined3d_context_copy_bo_address(context, &dst, dst_buffer->resource.bind_flags, + &src, src_buffer->resource.bind_flags, size); context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 24fab8491a..92d4766bc5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2372,6 +2372,19 @@ static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const ERR("Unsupported buffer object %#lx.\n", data->buffer_object); } +static void adapter_no3d_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + if (dst->buffer_object) + ERR("Unsupported dst buffer object %#lx.\n", dst->buffer_object); + if (src->buffer_object) + ERR("Unsupported src buffer object %#lx.\n", src->buffer_object); + if (dst->buffer_object || src->buffer_object) + return; + memcpy(dst->addr, src->addr, size); +} + static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -2626,6 +2639,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_uninit_3d, adapter_no3d_map_bo_address, adapter_no3d_unmap_bo_address, + adapter_no3d_copy_bo_address, adapter_no3d_create_swapchain, adapter_no3d_destroy_swapchain, adapter_no3d_create_buffer, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 648e3f0dee..5ce23f85f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2821,6 +2821,9 @@ struct wined3d_adapter_ops const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags); void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*adapter_copy_bo_address)(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size); HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); @@ -5267,6 +5270,14 @@ static inline void wined3d_context_unmap_bo_address(struct wined3d_context *cont context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags, range_count, ranges); } +static inline void wined3d_context_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + context->device->adapter->adapter_ops->adapter_copy_bo_address(context, + dst, dst_bind_flags, src, src_bind_flags, size); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Henri Verbeet : wined3d: Handle typeless formats in surface_cpu_blt().
by Alexandre Julliard 24 Sep '19

24 Sep '19

Module: wine Branch: master Commit: 810ae882f081818cf67550e075d5a2281ea312b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=810ae882f081818cf67550e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 18:08:44 2019 +0330 wined3d: Handle typeless formats in surface_cpu_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b07d3cd77e..5064fb917f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1654,6 +1654,14 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int context = context_acquire(device, NULL, 0); + src_format = src_texture->resource.format; + dst_format = dst_texture->resource.format; + + if (wined3d_format_is_typeless(src_format) && src_format->id == dst_format->typeless_id) + src_format = dst_format; + if (wined3d_format_is_typeless(dst_format) && dst_format->id == src_format->typeless_id) + dst_format = src_format; + dst_range.offset = 0; dst_range.size = dst_texture->sub_resources[dst_sub_resource_idx].size; if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) @@ -1671,30 +1679,23 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_READ | WINED3D_MAP_WRITE); src_map = dst_map; - src_format = dst_texture->resource.format; - dst_format = src_format; - dst_fmt_flags = dst_texture->resource.format_flags; - src_fmt_flags = dst_fmt_flags; } else { same_sub_resource = FALSE; - dst_format = dst_texture->resource.format; - dst_fmt_flags = dst_texture->resource.format_flags; - if (!(flags & WINED3D_BLT_RAW) && dst_texture->resource.format->id != src_texture->resource.format->id) + if (!(flags & WINED3D_BLT_RAW) && dst_format->id != src_format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { - FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id), - debug_d3dformat(dst_texture->resource.format->id)); + FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_format->id), + debug_d3dformat(dst_format->id)); context_release(context); return WINED3DERR_NOTAVAILABLE; } src_texture = converted_texture; src_sub_resource_idx = 0; + src_format = src_texture->resource.format; } - src_format = src_texture->resource.format; - src_fmt_flags = src_texture->resource.format_flags; map_binding = src_texture->resource.map_binding; texture_level = src_sub_resource_idx % src_texture->level_count; @@ -1715,6 +1716,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_map.data = wined3d_context_map_bo_address(context, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); } + src_fmt_flags = src_format->flags[src_texture->resource.gl_type]; + dst_fmt_flags = dst_format->flags[dst_texture->resource.gl_type]; flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count;

1 0