April 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : include: Add wcsicmp() inline wrapper.
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: 1f38c1abf62505786534a3324a82d0e798b4c185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f38c1abf62505786534a332… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 11:50:18 2019 +0200 include: Add wcsicmp() inline wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 1 + programs/reg/reg.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index d1dca89..0b36d2c 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -147,6 +147,7 @@ static inline char* strupr(char* str) { return _strupr(str); } static inline wchar_t* wcsdup(const wchar_t* str) { return _wcsdup(str); } static inline int wcsicoll(const wchar_t* str1, const wchar_t* str2) { return _wcsicoll(str1, str2); } static inline wchar_t* wcslwr(wchar_t* str) { return _wcslwr(str); } +static inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { return _wcsicmp(s1, s2); } static inline int wcsnicmp(const wchar_t* str1, const wchar_t* str2, size_t n) { return _wcsnicmp(str1, str2, n); } static inline wchar_t* wcsnset(wchar_t* str, wchar_t c, size_t n) { return _wcsnset(str, c, n); } static inline wchar_t* wcsrev(wchar_t* str) { return _wcsrev(str); } diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fe52568..987a556 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -230,7 +230,7 @@ static DWORD wchar_get_type(const WCHAR *type_name) for (i = 0; i < ARRAY_SIZE(type_rels); i++) { - if (!_wcsicmp(type_rels[i].name, type_name)) + if (!wcsicmp(type_rels[i].name, type_name)) return type_rels[i].type; }

1 0

Alexandre Julliard : msvcrt/tests: Add a function pointer to bypass builtin printf().
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: 7b83b6b9dedca9d0256b0430b4758bf45edaa4e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b83b6b9dedca9d0256b0430… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 19:29:15 2019 +0200 msvcrt/tests: Add a function pointer to bypass builtin printf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 300 +++++++++++++++++++++++---------------------- 1 file changed, 151 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b83b6b9dedca9d0256b…

1 0

Alexandre Julliard : ntoskrnl.exe/tests: Avoid standard C functions in kernel drivers.
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: c4433a06b7b03c3ffc7d80b5cce46ee9f408eb95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4433a06b7b03c3ffc7d80b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 16:45:01 2019 +0200 ntoskrnl.exe/tests: Avoid standard C functions in kernel drivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46993 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 3796ee5..c3839da 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -59,9 +59,8 @@ static void kvprintf(const char *format, __ms_va_list ap) { static char buffer[512]; IO_STATUS_BLOCK io; - - _vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, strlen(buffer), NULL, NULL); + int len = _vsnprintf(buffer, sizeof(buffer), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); } static void WINAPIV kprintf(const char *format, ...) @@ -193,6 +192,13 @@ static void *kmemcpy(void *dest, const void *src, SIZE_T n) return dest; } +static void *kmemset(void *dest, int c, SIZE_T n) +{ + unsigned char *d = dest; + while (n--) *d++ = (unsigned char)c; + return dest; +} + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -943,7 +949,7 @@ static void test_resource(void) BOOLEAN ret; HANDLE thread, thread2; - memset(&resource, 0xcc, sizeof(resource)); + kmemset(&resource, 0xcc, sizeof(resource)); status = ExInitializeResourceLite(&resource); ok(status == STATUS_SUCCESS, "got status %#x\n", status); @@ -1230,7 +1236,7 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * if (length < sizeof(teststr)) return STATUS_BUFFER_TOO_SMALL; - strcpy(buffer, teststr); + kmemcpy(buffer, teststr, sizeof(teststr)); *info = sizeof(teststr); return STATUS_SUCCESS;

1 0

Martin Storsjo : msvcrt: Implement _get_environ and _get_wenviron.
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: f20be3b00cee829ada0c7b4ed67af8f63b6aeff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20be3b00cee829ada0c7b4e… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 15:51:55 2019 +0300 msvcrt: Implement _get_environ and _get_wenviron. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/environ.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index cce62bc..cc180e8 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -310,3 +310,19 @@ int CDECL _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT strcpyW(buffer, e); return 0; } + +/********************************************************************* + * _get_environ (MSVCRT.@) + */ +void CDECL MSVCRT__get_environ(char ***ptr) +{ + *ptr = MSVCRT__environ; +} + +/********************************************************************* + * _get_wenviron (MSVCRT.@) + */ +void CDECL MSVCRT__get_wenviron(MSVCRT_wchar_t ***ptr) +{ + *ptr = MSVCRT__wenviron; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0c2881d..5be4b4c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -501,7 +501,7 @@ @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_doserrno(ptr) -# stub _get_environ(ptr) +@ cdecl _get_environ(ptr) MSVCRT__get_environ @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @@ -512,7 +512,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() -# stub _get_wenviron(ptr) +@ cdecl _get_wenviron(ptr) MSVCRT__get_wenviron @ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor @ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index fdfe81f..11b79f0 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -47,6 +47,8 @@ void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); +static void (*p_get_environ)(char ***); +static void (*p_get_wenviron)(WCHAR ***); static char ***p_environ; static WCHAR ***p_wenviron; @@ -59,6 +61,8 @@ static void init(void) p__p__wenviron = (void *)GetProcAddress(hmod, "__p__wenviron"); p_environ = (void *)GetProcAddress(hmod, "_environ"); p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); + p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); + p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); } static void test_system(void) @@ -95,6 +99,16 @@ static void test__environ(void) else win_skip( "__p__environ() is not available\n" ); + if (p_get_environ) + { + char **retptr; + p_get_environ(&retptr); + ok( retptr == *p_environ, + "Expected _environ pointers to be identical\n" ); + } + else + win_skip( "_get_environ() is not available\n" ); + /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -151,6 +165,16 @@ static void test__wenviron(void) else win_skip( "__p__wenviron() is not available\n" ); + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == NULL, + "Expected _wenviron pointers to be NULL\n" ); + } + else + win_skip( "_get_wenviron() is not available\n" ); + /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -191,6 +215,14 @@ static void test__wenviron(void) "Expected _wenviron pointers to be identical\n" ); } + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == *p_wenviron, + "Expected _wenviron pointers to be identical\n" ); + } + for (i = 0; ; i++) { if ((*p_wenviron)[i])

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite() .
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: ab22796ab05bd516186500640f961700cce7f3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab22796ab05bd51618650064… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:10 2019 -0500 ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 25 +++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d3e6070..ab952e5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -166,7 +166,7 @@ @ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stub ExIsProcessorFeaturePresent @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) -@ stub ExIsResourceAcquiredSharedLite +@ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime @ stub ExNotifyCallback @ stub ExQueryPoolBlockSize diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 94b9778..fbe9dbe 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1144,3 +1144,28 @@ BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite( ERESOURCE *resource ) return ret; } + +/*********************************************************************** + * ExIsResourceAcquiredSharedLite (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource ) +{ + ULONG ret; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + ret = resource->ActiveEntries; + else + { + OWNER_ENTRY *entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + ret = entry->OwnerCount; + } + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return ret; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5a84602..dae83af 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1532,6 +1532,7 @@ 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*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); +ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add tests for ERESOURCE functions.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: cc2e8d7cda1ab349dd7c67eb07dc8108def9f0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2e8d7cda1ab349dd7c67eb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:11 2019 -0500 ntoskrnl.exe/tests: Add tests for ERESOURCE functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 311 ++++++++++++++++++++++++++++++++++++++- include/ddk/wdm.h | 2 + 2 files changed, 312 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc2e8d7cda1ab349dd7c…

1 0

Józef Kucia : winevulkan: Generate conversion function for VkInstanceCreateInfo structure extensions.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: a4b9460ad68bad6675f9e50b390503db9ef94d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b9460ad68bad6675f9e50b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:49 2019 +0200 winevulkan: Generate conversion function for VkInstanceCreateInfo structure extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 145 ++++++++++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan.c | 31 ++------- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 3 + 4 files changed, 177 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4b9460ad68bad6675f9…

1 0

Józef Kucia : winevulkan: Generate conversion function for VkDeviceCreateInfo structure extensions.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: df6b2381f8f1017c6a58a113438f7a36f12fcfb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df6b2381f8f1017c6a58a113… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:50 2019 +0200 winevulkan: Generate conversion function for VkDeviceCreateInfo structure extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 168 +++--------- dlls/winevulkan/vulkan_thunks.c | 579 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 2 + 4 files changed, 622 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df6b2381f8f1017c6a58…

1 0

Józef Kucia : winevulkan: Enable VK_AMD_memory_overallocation_behavior.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: abc83d1b3447e731f01f144d88c5d919efcab8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=abc83d1b3447e731f01f144d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:51 2019 +0200 winevulkan: Enable VK_AMD_memory_overallocation_behavior. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index af37657..46294f7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -101,7 +101,6 @@ BLACKLISTED_EXTENSIONS = [ # Device extensions "VK_AMD_display_native_hdr", "VK_EXT_calibrated_timestamps", - "VK_AMD_memory_overallocation_behavior", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fc41fb0..9919642 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1828,6 +1828,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD: + { + const VkDeviceMemoryOverallocationCreateInfoAMD *in = (const VkDeviceMemoryOverallocationCreateInfoAMD *)in_header; + VkDeviceMemoryOverallocationCreateInfoAMD *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->overallocationBehavior = in->overallocationBehavior; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT: { const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *in = (const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *)in_header; @@ -4225,6 +4241,7 @@ static const char * const vk_device_extensions[] = "VK_AMD_gcn_shader", "VK_AMD_gpu_shader_half_float", "VK_AMD_gpu_shader_int16", + "VK_AMD_memory_overallocation_behavior", "VK_AMD_mixed_attachment_samples", "VK_AMD_negative_viewport_height", "VK_AMD_rasterization_order", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 2a86277..5a48441 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -260,6 +260,8 @@ #define VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME "VK_KHR_shader_atomic_int64" #define VK_AMD_SHADER_CORE_PROPERTIES_SPEC_VERSION 1 #define VK_AMD_SHADER_CORE_PROPERTIES_EXTENSION_NAME "VK_AMD_shader_core_properties" +#define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_SPEC_VERSION 1 +#define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_EXTENSION_NAME "VK_AMD_memory_overallocation_behavior" #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 3 #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor" #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 @@ -1445,6 +1447,14 @@ typedef enum VkMemoryHeapFlagBits VK_MEMORY_HEAP_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkMemoryHeapFlagBits; +typedef enum VkMemoryOverallocationBehaviorAMD +{ + VK_MEMORY_OVERALLOCATION_BEHAVIOR_DEFAULT_AMD = 0, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_ALLOWED_AMD = 1, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_DISALLOWED_AMD = 2, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_AMD_MAX_ENUM = 0x7fffffff, +} VkMemoryOverallocationBehaviorAMD; + typedef enum VkMemoryPropertyFlagBits { VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT = 0x00000001, @@ -2067,6 +2077,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = 1000177000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, + VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, @@ -2429,6 +2440,13 @@ typedef struct VkDeviceGroupPresentInfoKHR VkDeviceGroupPresentModeFlagBitsKHR mode; } VkDeviceGroupPresentInfoKHR; +typedef struct VkDeviceMemoryOverallocationCreateInfoAMD +{ + VkStructureType sType; + const void *pNext; + VkMemoryOverallocationBehaviorAMD overallocationBehavior; +} VkDeviceMemoryOverallocationCreateInfoAMD; + typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { VkStructureType sType;

1 0

Józef Kucia : winevulkan: Enable VK_EXT_memory_priority.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 4b269f029324e8b47644cc6234c644edaae3c7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b269f029324e8b47644cc62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:52 2019 +0200 winevulkan: Enable VK_EXT_memory_priority. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 46294f7..f6a63cb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -105,7 +105,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_memory_priority", "VK_EXT_pipeline_creation_feedback", "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_display_timing", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 9919642..b2b0037 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1894,6 +1894,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT: + { + const VkPhysicalDeviceMemoryPriorityFeaturesEXT *in = (const VkPhysicalDeviceMemoryPriorityFeaturesEXT *)in_header; + VkPhysicalDeviceMemoryPriorityFeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->memoryPriority = in->memoryPriority; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT: { const VkPhysicalDeviceBufferAddressFeaturesEXT *in = (const VkPhysicalDeviceBufferAddressFeaturesEXT *)in_header; @@ -4268,6 +4284,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_host_query_reset", "VK_EXT_inline_uniform_block", "VK_EXT_memory_budget", + "VK_EXT_memory_priority", "VK_EXT_pci_bus_info", "VK_EXT_post_depth_coverage", "VK_EXT_queue_family_foreign", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 5a48441..7a98951 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -300,6 +300,8 @@ #define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string" #define VK_EXT_MEMORY_BUDGET_SPEC_VERSION 1 #define VK_EXT_MEMORY_BUDGET_EXTENSION_NAME "VK_EXT_memory_budget" +#define VK_EXT_MEMORY_PRIORITY_SPEC_VERSION 1 +#define VK_EXT_MEMORY_PRIORITY_EXTENSION_NAME "VK_EXT_memory_priority" #define VK_EXT_BUFFER_DEVICE_ADDRESS_SPEC_VERSION 2 #define VK_EXT_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_EXT_buffer_device_address" #define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 @@ -2101,6 +2103,8 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = 1000221000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, + VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = 1000244000, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = 1000244001, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, @@ -2966,6 +2970,13 @@ typedef struct VkPhysicalDeviceLimits VkDeviceSize WINE_VK_ALIGN(8) nonCoherentAtomSize; } VkPhysicalDeviceLimits; +typedef struct VkPhysicalDeviceMemoryPriorityFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 memoryPriority; +} VkPhysicalDeviceMemoryPriorityFeaturesEXT; + typedef struct VkPhysicalDeviceMeshShaderPropertiesNV { VkStructureType sType; @@ -3659,6 +3670,13 @@ typedef struct VkMemoryDedicatedRequirements VkBool32 requiresDedicatedAllocation; } VkMemoryDedicatedRequirements; +typedef struct VkMemoryPriorityAllocateInfoEXT +{ + VkStructureType sType; + const void *pNext; + float priority; +} VkMemoryPriorityAllocateInfoEXT; + typedef struct VkMemoryType { VkMemoryPropertyFlags propertyFlags;

1 0