wine-devel April 2019

wine-devel@winehq.org

82 participants
743 discussions

[PATCH 2/2] ws2_32: Invalidate client-side file descriptor cache in WSACleanup.
by Alistair Leslie-Hughes 09 Apr '19

09 Apr '19

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/server.c | 24 ++++++++++++++++++++++++ dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 5 +---- include/wine/server.h | 1 + 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 292b0f6..157be4b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1499,6 +1499,7 @@ # Server interface @ cdecl -norelay wine_server_call(ptr) +@ cdecl wine_server_close_fds_by_type(long) @ cdecl wine_server_fd_to_handle(long long long ptr) @ cdecl wine_server_handle_to_fd(long long ptr ptr) @ cdecl wine_server_release_fd(long long) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 094b530..df1590a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -921,6 +921,30 @@ int server_remove_fd_from_cache( HANDLE handle ) /*********************************************************************** + * wine_server_close_fds_by_type + * + * Needed for a proper implementation of WSACleanup. + */ +void CDECL wine_server_close_fds_by_type( enum server_fd_type type ) +{ + union fd_cache_entry cache; + unsigned int entry, idx; + + for (entry = 0; entry < FD_CACHE_ENTRIES; entry++) + { + if (!fd_cache[entry]) continue; + for (idx = 0; idx < FD_CACHE_BLOCK_SIZE; idx++) + { + cache.data = interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, 0 ); + if (cache.s.type != type || cache.s.fd == 0) continue; + if (interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, cache.data ) != cache.data) continue; + close( cache.s.fd - 1 ); + } + } +} + + +/*********************************************************************** * server_get_unix_fd * * The returned unix_fd should be closed iff needs_close is non-zero. diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a2b9aea..f75d780 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1705,6 +1705,7 @@ INT WINAPI WSACleanup(void) if (!--num_startup) { + wine_server_close_fds_by_type( FD_TYPE_SOCKET ); SERVER_START_REQ(socket_cleanup) { wine_server_call( req ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f0fa8f0..270d147 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1248,10 +1248,7 @@ static void test_WithWSAStartup(void) SetLastError(0xdeadbeef); res = getsockname(sock, (struct sockaddr *)&saddr, &size); error = WSAGetLastError(); - if (j == 2 || (j == 0 && i == 0)) - todo_wine ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); - else - ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); + ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); todo_wine ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); } } diff --git a/include/wine/server.h b/include/wine/server.h index d573d1f..02d9c7b 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -54,6 +54,7 @@ extern void CDECL wine_server_send_fd( int fd ); extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); extern void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ); +extern void CDECL wine_server_close_fds_by_type( enum server_fd_type type ); /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr ) -- 1.9.1

2 1

[PATCH 1/2] ws2_32: Implement WSACleanup via wineserver function.
by Alistair Leslie-Hughes 09 Apr '19

09 Apr '19

From: Matt Durgavich <mattdurgavich(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 22 ++++++++++++++++------ dlls/ws2_32/tests/sock.c | 15 +++++++-------- server/protocol.def | 3 +++ server/sock.c | 9 +++++++++ 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a302612..a2b9aea 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1697,13 +1697,23 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) */ INT WINAPI WSACleanup(void) { - if (num_startup) { - num_startup--; - TRACE("pending cleanups: %d\n", num_startup); - return 0; + if (!num_startup) + { + SetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; } - SetLastError(WSANOTINITIALISED); - return SOCKET_ERROR; + + if (!--num_startup) + { + SERVER_START_REQ(socket_cleanup) + { + wine_server_call( req ); + } + SERVER_END_REQ; + } + + TRACE("pending cleanups: %d\n", num_startup); + return 0; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0c7f736..f0fa8f0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1218,18 +1218,17 @@ static void test_WithWSAStartup(void) ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); /* show that sockets are destroyed automatically after WSACleanup */ - todo_wine { SetLastError(0xdeadbeef); res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); ok(res == SOCKET_ERROR, "send should have failed\n"); - ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + todo_wine ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); SetLastError(0xdeadbeef); res = send(pairs[0].dst, "TEST", 4, 0); error = WSAGetLastError(); ok(res == SOCKET_ERROR, "send should have failed\n"); - ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + todo_wine ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); /* Check that all sockets were destroyed */ for (i = 0; i < socks; i++) @@ -1249,14 +1248,14 @@ static void test_WithWSAStartup(void) SetLastError(0xdeadbeef); res = getsockname(sock, (struct sockaddr *)&saddr, &size); error = WSAGetLastError(); - ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); - if (res == SOCKET_ERROR) - ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); + if (j == 2 || (j == 0 && i == 0)) + todo_wine ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); + else + ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); + todo_wine ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); } } - } - /* While wine is not fixed, close all sockets manually */ for (i = 0; i < socks; i++) { diff --git a/server/protocol.def b/server/protocol.def index b6ad514..af0bc20 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1006,6 +1006,9 @@ struct rawinput_device obj_handle_t handle; /* handle to close */ @END +/* Close all sockets for the current process */ +@REQ(socket_cleanup) +@END /* Set a handle information */ @REQ(set_handle_info) diff --git a/server/sock.c b/server/sock.c index 1a53ce4..5095a6e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1334,3 +1334,12 @@ DECL_HANDLER(get_socket_info) release_object( &sock->obj ); } + +DECL_HANDLER(socket_cleanup) +{ + unsigned int index = 0; + obj_handle_t sock; + + while ((sock = enumerate_handles(current->process, &sock_ops, &index))) + close_handle(current->process, sock); +} -- 1.9.1

2 1

[PATCH 1/8] ntoskrnl.exe: Implement ExInitializeResourceLite().
by Zebediah Figura 08 Apr '19

08 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45819 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 -------- dlls/ntoskrnl.exe/sync.c | 10 +++++++ include/ddk/wdm.h | 54 +++++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ac577819b1..013be47040 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2373,17 +2373,6 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) HeapFree( ntoskrnl_heap, 0, ptr ); } - -/*********************************************************************** - * ExInitializeResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) -{ - FIXME( "stub: %p\n", Resource ); - return STATUS_NOT_IMPLEMENTED; -} - - /*********************************************************************** * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 12dacae408..168c6d1642 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -717,3 +717,13 @@ void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) if (count < 1) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } + +/*********************************************************************** + * ExInitializeResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + memset(resource, 0, sizeof(*resource)); + return STATUS_SUCCESS; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e5804c0270..a6536212b6 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -153,12 +153,63 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _OWNER_ENTRY +{ + ERESOURCE_THREAD OwnerThread; + union + { + struct + { + ULONG IoPriorityBoosted : 1; + ULONG OwnerReferenced : 1; + ULONG IoQoSPriorityBoosted : 1; + ULONG OwnerCount : 29; + }; + ULONG TableSize; + }; +} OWNER_ENTRY, *POWNER_ENTRY; + +#define ResourceNeverExclusive 0x0010 +#define ResourceReleaseByOtherThread 0x0020 +#define ResourceOwnedExclusive 0x0080 + +typedef struct _ERESOURCE +{ + LIST_ENTRY SystemResourcesList; + OWNER_ENTRY *OwnerTable; + SHORT ActiveCount; + union + { + USHORT Flag; + struct + { + UCHAR ReservedLowFlags; + UCHAR WaiterPriority; + }; + }; + KSEMAPHORE *SharedWaiters; + KEVENT *ExclusiveWaiters; + OWNER_ENTRY OwnerEntry; + ULONG ActiveEntries; + ULONG ContentionCount; + ULONG NumberOfSharedWaiters; + ULONG NumberOfExclusiveWaiters; +#ifdef _WIN64 + void *Reserved2; +#endif + union + { + void *Address; + ULONG_PTR CreatorBackTraceIndex; + }; + KSPIN_LOCK SpinLock; +} ERESOURCE, *PERESOURCE; + typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; -typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; @@ -1469,6 +1520,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); +NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); -- 2.21.0

2 15

[PATCH 1/5] qcap/tests: Add some tests for AVI compressor pin interfaces.
by Zebediah Figura 08 Apr '19

08 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/avico.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 5c60846013..2d2d4c7f2b 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -54,6 +54,8 @@ static ULONG get_refcount(void *iface) static void test_interfaces(IBaseFilter *filter) { + IPin *pin; + check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); @@ -71,6 +73,29 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_FindPin(filter, source_id, &pin); + + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); } static void test_enum_pins(IBaseFilter *filter) -- 2.21.0

1 4

[PATCH vkd3d 6/6] build: Drop hack for stripping RPC includes from widl-generated headers.
by Józef Kucia 08 Apr '19

08 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> This requires widl from Wine >= 3.20: commit b7402ddbbecdfaa81daa657fbb5d37661f401434 Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 19 15:07:02 2018 +0100 widl: Guard RPC includes with #ifdef _WIN32. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 6 ++---- configure.ac | 2 +- m4/widl.m4 | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 m4/widl.m4 diff --git a/Makefile.am b/Makefile.am index 9ad7b2e3b9a5..2b5bca0871c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,9 +170,7 @@ vkd3d_v_widl_1 = EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL - $(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $< - $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ - $(AM_V_at)$(RM) $@.tmp + $(VKD3D_V_WIDL)$(WIDL) -h -o $@ $< else @echo "widl is required to generate $@" endif @@ -235,7 +233,7 @@ $(CROSS32_IMPLIBS): %.cross32.a: %.cross32.def $(AM_V_GEN)$(CROSS32_DLLTOOL) -k -m i386 --as-flags=-32 -d $< -l $@ $(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers) - $(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ + $(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \ $(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 && \ $(am__mv) $$depbase.Tpo $$depbase.Po else diff --git a/configure.ac b/configure.ac index 029278126b49..28f2ac908733 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_SED AC_PROG_MKDIR_P -AC_CHECK_PROG([WIDL], [widl], [widl], [no]) +VKD3D_PROG_WIDL(3, 20) AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])]) AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror]) diff --git a/m4/widl.m4 b/m4/widl.m4 new file mode 100644 index 000000000000..2849356f7c04 --- /dev/null +++ b/m4/widl.m4 @@ -0,0 +1,14 @@ +dnl VKD3D_PROG_WIDL(major, minor) +AC_DEFUN([VKD3D_PROG_WIDL], + +[AC_CHECK_PROG([WIDL], [widl], [widl], [no]) + +AS_IF([test "x$WIDL" != "xno"], +[AC_MSG_CHECKING([checking whether widl version >= $1.$2]) +vkd3d_widl_version=`$WIDL -V | $SED -E '/version/{s/.* version (.*)/\1/;q;}'` + +AX_COMPARE_VERSION([$vkd3d_widl_version], [ge], [$1.$2], + [AC_MSG_RESULT([yes ($vkd3d_widl_version)])], + [AC_MSG_RESULT([no ($vkd3d_widl_version)]) + WIDL=no]) +])]) -- 2.21.0

4 3

[PATCH 2/2] d3d11/tests: Reduce output produced by test_clear_buffer_unordered_access_view().
by Józef Kucia 08 Apr '19

08 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 64729d5f03d0..3d6cbf57e20f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14524,31 +14524,36 @@ static void test_clear_buffer_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { + const struct uvec4 *data = NULL; + BOOL all_match; + uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) + for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { - const struct uvec4 *data = get_readback_uvec4(&rb, x, 0); const struct uvec4 broken_result = {uvec4.x, uvec4.x, uvec4.x, uvec4.x}; /* Intel */ - ok(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)), - "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", - data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, i); + data = get_readback_uvec4(&rb, x, 0); + if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + all_match = FALSE; } + ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", + data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) + for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x) { - const struct uvec4 *data = get_readback_uvec4(&rb, x, 0); struct uvec4 broken_result; + data = get_readback_uvec4(&rb, x, 0); uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; broken_result.x = broken_result.y = broken_result.z = broken_result.w = uvec4.x; - ok(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)), - "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", - data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, i); + if (!(compare_uvec4(data, &uvec4) || broken(compare_uvec4(data, &broken_result)))) + all_match = FALSE; } + ok(all_match, "Got {%#x, %#x, %#x, %#x}, expected {%#x, %#x, %#x, %#x} at %u.\n", + data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x); release_resource_readback(&rb); } @@ -14574,17 +14579,16 @@ static void test_clear_buffer_unordered_access_view(void) uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - todo_wine check_rgba_sint8(get_readback_color(&rb, x, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; - todo_wine check_rgba_sint8(get_readback_color(&rb, x, 0, 0), &uvec4); - } + todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4); + todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement, 0, 0), &fe_uvec4); release_resource_readback(&rb); } -- 2.21.0

3 2

[PATCH 1/2] d3d11/tests: Use check_readback_data_color() in test_clear_buffer_unordered_access_view().
by Józef Kucia 08 Apr '19

08 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 78 +++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d5445ef8b2d8..64729d5f03d0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14311,6 +14311,7 @@ static void test_clear_buffer_unordered_access_view(void) unsigned int i, x; ULONG refcount; HRESULT hr; + RECT rect; static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; static const struct uvec4 fe_uvec4 = {0xfefefefe, 0xfefefefe, 0xfefefefe, 0xfefefefe}; @@ -14397,10 +14398,10 @@ static void test_clear_buffer_unordered_access_view(void) buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; buffer_desc.StructureByteStride = 4; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); - ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); uav_desc.Format = DXGI_FORMAT_UNKNOWN; uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; @@ -14408,28 +14409,23 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 4; U(uav_desc).Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - DWORD data = get_readback_color(&rb, x, 0, 0); - ok(data == uvec4.x, "Got unexpected value %#x at %u.\n", data, x); - } + SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); + check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - DWORD data = get_readback_color(&rb, x, 0, 0); - uvec4 = x < U(uav_desc).Buffer.NumElements ? fe_uvec4 : uvec4_data[i]; - ok(data == uvec4.x, "Got unexpected value %#x at %u.\n", data, x); - } + SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements, 1); + check_readback_data_color(&rb, &rect, fe_uvec4.x, 0); + SetRect(&rect, U(uav_desc).Buffer.NumElements, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); + check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); } @@ -14440,7 +14436,7 @@ static void test_clear_buffer_unordered_access_view(void) /* Raw buffer views */ buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); - ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; @@ -14448,32 +14444,27 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 16; U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); U(uav_desc).Buffer.FirstElement = 8; U(uav_desc).Buffer.NumElements = 8; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - DWORD data = get_readback_color(&rb, x, 0, 0); - ok(data == uvec4.x, "Got unexpected value %#x at %u.\n", data, x); - } + SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); + check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - DWORD data = get_readback_color(&rb, x, 0, 0); - uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; - ok(data == uvec4.x, "Got unexpected value %#x at %u.\n", data, x); - } + SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1); + check_readback_data_color(&rb, &rect, uvec4.x, 0); + SetRect(&rect, U(uav_desc).Buffer.FirstElement, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); + check_readback_data_color(&rb, &rect, fe_uvec4.x, 0); release_resource_readback(&rb); } @@ -14484,7 +14475,7 @@ static void test_clear_buffer_unordered_access_view(void) /* Typed buffer views */ buffer_desc.MiscFlags = 0; hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); - ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); uav_desc.Format = DXGI_FORMAT_R32_SINT; uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; @@ -14492,32 +14483,27 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 16; U(uav_desc).Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); U(uav_desc).Buffer.FirstElement = 9; U(uav_desc).Buffer.NumElements = 7; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { uvec4 = uvec4_data[i]; ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - DWORD data = get_readback_color(&rb, x, 0, 0); - ok(data == uvec4.x, "Got unexpected value %#x at %u.\n", data, x); - } + SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); + check_readback_data_color(&rb, &rect, uvec4.x, 0); release_resource_readback(&rb); ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x); get_buffer_readback(buffer, &rb); - for (x = 0; x < buffer_desc.ByteWidth / sizeof(uvec4.x); ++x) - { - DWORD data = get_readback_color(&rb, x, 0, 0); - uvec4 = U(uav_desc).Buffer.FirstElement <= x ? fe_uvec4 : uvec4_data[i]; - ok(data == uvec4.x, "Got unexpected value %#x at %u.\n", data, x); - } + SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1); + check_readback_data_color(&rb, &rect, uvec4.x, 0); + SetRect(&rect, U(uav_desc).Buffer.FirstElement, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1); + check_readback_data_color(&rb, &rect, fe_uvec4.x, 0); release_resource_readback(&rb); } @@ -14530,11 +14516,11 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 4; U(uav_desc).Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); U(uav_desc).Buffer.FirstElement = 2; U(uav_desc).Buffer.NumElements = 2; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { @@ -14577,11 +14563,11 @@ static void test_clear_buffer_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 16; U(uav_desc).Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); U(uav_desc).Buffer.FirstElement = 8; U(uav_desc).Buffer.NumElements = 8; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav2); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i) { -- 2.21.0

3 2

[PATCH] d3d11: Don't use strcasecmp.
by Piotr Caban 08 Apr '19

08 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3d11/inputlayout.c | 3 ++- dlls/d3d11/shader.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

3 2

[PATCH 2/5] wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map.
by Józef Kucia 08 Apr '19

08 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 7 +------ dlls/wined3d/wined3d_gl.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3ffbbaf32971..c195bf4993db 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -205,7 +205,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_texture_swizzle", ARB_TEXTURE_SWIZZLE }, - {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, + {"GL_EXT_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, /* NV */ {"GL_NV_fence", NV_FENCE }, @@ -3530,11 +3530,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) - { - TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); - gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; - } if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ae067e65805a..5241b6c41e14 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -186,7 +186,6 @@ enum wined3d_gl_extension EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, - EXT_VERTEX_ARRAY_BGRA, /* NVIDIA */ NV_FENCE, NV_FOG_DISTANCE, -- 2.21.0

2 1

[PATCH 4/5] wined3d: Initialise driver and device UUID for Vulkan adapters.
by Józef Kucia 08 Apr '19

08 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 47 +++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_vk.h | 8 ++++++- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8ef0aea3ca3c..2c6ea25a9f13 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -29,6 +29,12 @@ static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const st return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); } +static const char *debug_vk_version(uint32_t version) +{ + return wine_dbg_sprintf("%u.%u.%u", + VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -226,10 +232,12 @@ static unsigned int wined3d_get_wine_vk_version(void) static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { + PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion; struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; VkApplicationInfo app_info; + uint32_t api_version = 0; char app_name[MAX_PATH]; VkResult vr; @@ -242,13 +250,23 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + vk_info->api_version = VK_API_VERSION_1_0; + if ((pfn_vkEnumerateInstanceVersion = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"))) + && pfn_vkEnumerateInstanceVersion(&api_version) == VK_SUCCESS) + { + TRACE("Vulkan instance API version %s.\n", debug_vk_version(api_version)); + + if (api_version >= VK_API_VERSION_1_1) + vk_info->api_version = VK_API_VERSION_1_1; + } + memset(&app_info, 0, sizeof(app_info)); app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) app_info.pApplicationName = app_name; app_info.pEngineName = "Damavand"; app_info.engineVersion = wined3d_get_wine_vk_version(); - app_info.apiVersion = VK_API_VERSION_1_0; + app_info.apiVersion = vk_info->api_version; memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -267,11 +285,15 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) WARN("Could not get instance proc addr for '" #name "'.\n"); \ goto fail; \ } +#define LOAD_INSTANCE_OPT_PFN(name) \ + vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)); #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN +#define VK_INSTANCE_EXT_PFN LOAD_INSTANCE_OPT_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN VK_INSTANCE_FUNCS() VK_DEVICE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN vk_info->instance = instance; @@ -324,8 +346,7 @@ const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysica TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(properties->apiVersion), - VK_VERSION_MINOR(properties->apiVersion), VK_VERSION_PATCH(properties->apiVersion)); + TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); if ((description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID))) return description; @@ -342,7 +363,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceIDProperties id_properties; + VkPhysicalDeviceProperties2 properties2; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -359,16 +381,27 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; - VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties)); - adapter_vk->device_limits = properties.limits; + memset(&id_properties, 0, sizeof(id_properties)); + id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id_properties; - if (!(gpu_description = get_vulkan_gpu_description(&properties))) + if (vk_info->api_version >= VK_API_VERSION_1_1) + VK_CALL(vkGetPhysicalDeviceProperties2(adapter_vk->physical_device, &properties2)); + else + VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); + adapter_vk->device_limits = properties2.properties.limits; + + if (!(gpu_description = get_vulkan_gpu_description(&properties2.properties))) { ERR("Failed to get GPU description.\n"); goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); + memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); + if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) goto fail_vulkan; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 784dd0c310c5..10c706a10331 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -38,7 +38,9 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) \ - VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) + VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) \ + /* Vulkan 1.1 */ \ + VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2) #define VK_DEVICE_FUNCS() \ VK_DEVICE_PFN(vkAllocateCommandBuffers) \ @@ -167,10 +169,12 @@ struct vulkan_ops { #define VK_INSTANCE_PFN DECLARE_VK_PFN +#define VK_INSTANCE_EXT_PFN DECLARE_VK_PFN #define VK_DEVICE_PFN DECLARE_VK_PFN VK_DEVICE_FUNCS() VK_INSTANCE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN PFN_vkCreateInstance vkCreateInstance; @@ -182,6 +186,8 @@ struct wined3d_vk_info VkInstance instance; struct vulkan_ops vk_ops; + unsigned int api_version; + #ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; #endif -- 2.21.0

2 1

← Newer
1
...
49
50
51
52
53
54
55
...
75
Older →

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-devel April 2019