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

Alexandre Julliard : msvcirt: Rename clog variable to avoid conflict with builtin function.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: e79b0fd7524fff38a289dd81120abb9764892a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e79b0fd7524fff38a289dd81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 10:13:59 2019 +0200 msvcirt: Rename clog variable to avoid conflict with builtin function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 18 +++++++++--------- dlls/msvcirt/msvcirt.spec | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7f48346..c129e0f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -332,7 +332,7 @@ struct { struct { ostream os; ios vbase; -} cout = { { 0 } }, cerr = { { 0 } }, clog = { { 0 } }; +} cout = { { 0 } }, cerr = { { 0 } }, MSVCP_clog = { { 0 } }; /* ??0streambuf@@IAE(a)PADH@Z */ @@ -4455,11 +4455,11 @@ void __cdecl ios_sync_with_stdio(void) if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) { stdiobuf_file_ctor(new_buf, stderr); stdiobuf_setrwbuf(new_buf, 0, 512); - ostream_assign_sb(&clog.os, &new_buf->base); + ostream_assign_sb(&MSVCP_clog.os, &new_buf->base); } else - ostream_assign_sb(&clog.os, NULL); - clog.vbase.delbuf = 1; - ios_setf(&clog.vbase, FLAGS_stdio); + ostream_assign_sb(&MSVCP_clog.os, NULL); + MSVCP_clog.vbase.delbuf = 1; + ios_setf(&MSVCP_clog.vbase, FLAGS_stdio); } } @@ -4555,10 +4555,10 @@ static void init_io(void *base) if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { filebuf_fd_ctor(fb, 2); - ostream_withassign_sb_ctor(&clog.os, &fb->base, TRUE); + ostream_withassign_sb_ctor(&MSVCP_clog.os, &fb->base, TRUE); } else - ostream_withassign_sb_ctor(&clog.os, NULL, TRUE); - Iostream_init_ios_ctor(NULL, &clog.vbase, 0); + ostream_withassign_sb_ctor(&MSVCP_clog.os, NULL, TRUE); + Iostream_init_ios_ctor(NULL, &MSVCP_clog.vbase, 0); } static void free_io(void) @@ -4567,7 +4567,7 @@ static void free_io(void) istream_vbase_dtor(&cin.is); ostream_vbase_dtor(&cout.os); ostream_vbase_dtor(&cerr.os); - ostream_vbase_dtor(&clog.os); + ostream_vbase_dtor(&MSVCP_clog.os); } BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 2e5154c..f2e8756 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -423,7 +423,7 @@ @ extern ?cin@@3Vistream_withassign@@A cin @ thiscall -arch=win32 ?clear(a)ios@@QAEXH(a)Z(ptr long) ios_clear @ cdecl -arch=win64 ?clear(a)ios@@QEAAXH(a)Z(ptr long) ios_clear -@ extern ?clog@@3Vostream_withassign@@A clog +@ extern ?clog@@3Vostream_withassign@@A MSVCP_clog @ thiscall -arch=win32 ?close(a)filebuf@@QAEPAV1(a)XZ(ptr) filebuf_close @ cdecl -arch=win64 ?close(a)filebuf@@QEAAPEAV1(a)XZ(ptr) filebuf_close @ stub -arch=win32 ?close(a)fstream@@QAEXXZ # void __thiscall fstream::close(void)

1 0

Zebediah Figura : qcap: Get rid of V4l_Prepare().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: bc42cc42795ef04624cb7b3ec98b24a8db44554d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc42cc42795ef04624cb7b3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:00 2019 -0500 qcap: Get rid of V4l_Prepare(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 752751a..ab39b71 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -122,15 +122,6 @@ static int xioctl(int fd, int request, void * arg) return r; } -/* Prepare the capture buffers */ -static HRESULT V4l_Prepare(Capture *device) -{ - device->image_size = device->height * device->width * 3; - if (!(device->image_data = heap_alloc(device->image_size))) - return E_OUTOFMEMORY; - return S_OK; -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -392,10 +383,10 @@ static DWORD WINAPI ReadThread(LPVOID lParam) ULONG framecount = 0; unsigned char *pTarget, *pInput, *pOutput; - hr = V4l_Prepare(capBox); - if (FAILED(hr)) + capBox->image_size = capBox->height * capBox->width * 3; + if (!(capBox->image_data = heap_alloc(capBox->image_size))) { - ERR("Stop IFilterGraph: %x\n", hr); + ERR("Failed to allocate memory.\n"); capBox->thread = 0; capBox->stopped = TRUE; return 0;

1 0

Alexandre Julliard : ntoskrnl.exe/tests: Avoid standard C functions in kernel drivers.
by Alexandre Julliard April 11, 2019

April 11, 2019

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

Alexandre Julliard : include: Add wcsicmp() inline wrapper.
by Alexandre Julliard April 11, 2019

April 11, 2019

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

Józef Kucia : winevulkan: Generate conversion function for VkDeviceCreateInfo structure extensions.
by Alexandre Julliard April 10, 2019

April 10, 2019

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_EXT_memory_priority.
by Alexandre Julliard April 10, 2019

April 10, 2019

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

Józef Kucia : winevulkan: Enable VK_EXT_external_memory_host.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 59b5394eefe25f3c3cf0ad9c7c2a528203307925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b5394eefe25f3c3cf0ad9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:53 2019 +0200 winevulkan: Enable VK_EXT_external_memory_host. 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 | 8 ++++++++ dlls/winevulkan/vulkan_thunks.h | 2 ++ include/wine/vulkan.h | 31 +++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f6a63cb..be3996c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -102,7 +102,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_AMD_display_native_hdr", "VK_EXT_calibrated_timestamps", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter - "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. "VK_EXT_pipeline_creation_feedback", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index b2b0037..e80bb7c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3495,6 +3495,12 @@ void WINAPI wine_vkGetImageSubresourceLayout(VkDevice device, VkImage image, con #endif } +static VkResult WINAPI wine_vkGetMemoryHostPointerPropertiesEXT(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void *pHostPointer, VkMemoryHostPointerPropertiesEXT *pMemoryHostPointerProperties) +{ + TRACE("%p, %#x, %p, %p\n", device, handleType, pHostPointer, pMemoryHostPointerProperties); + return device->funcs.p_vkGetMemoryHostPointerPropertiesEXT(device->device, handleType, pHostPointer, pMemoryHostPointerProperties); +} + void WINAPI wine_vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures *pFeatures) { TRACE("%p, %p\n", physicalDevice, pFeatures); @@ -4143,6 +4149,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkGetImageSparseMemoryRequirements2", &wine_vkGetImageSparseMemoryRequirements2}, {"vkGetImageSparseMemoryRequirements2KHR", &wine_vkGetImageSparseMemoryRequirements2KHR}, {"vkGetImageSubresourceLayout", &wine_vkGetImageSubresourceLayout}, + {"vkGetMemoryHostPointerPropertiesEXT", &wine_vkGetMemoryHostPointerPropertiesEXT}, {"vkGetPipelineCacheData", &wine_vkGetPipelineCacheData}, {"vkGetQueryPoolResults", &wine_vkGetQueryPoolResults}, {"vkGetQueueCheckpointDataNV", &wine_vkGetQueueCheckpointDataNV}, @@ -4278,6 +4285,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_depth_range_unrestricted", "VK_EXT_descriptor_indexing", "VK_EXT_discard_rectangles", + "VK_EXT_external_memory_host", "VK_EXT_filter_cubic", "VK_EXT_fragment_density_map", "VK_EXT_global_priority", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 5da9aa9..71ede94 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1124,6 +1124,7 @@ struct vulkan_device_funcs #else void (*p_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout *); #endif + VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *); VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); VkResult (*p_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags); void (*p_vkGetQueueCheckpointDataNV)(VkQueue, uint32_t *, VkCheckpointDataNV *); @@ -1425,6 +1426,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetImageSparseMemoryRequirements2) \ USE_VK_FUNC(vkGetImageSparseMemoryRequirements2KHR) \ USE_VK_FUNC(vkGetImageSubresourceLayout) \ + USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \ USE_VK_FUNC(vkGetPipelineCacheData) \ USE_VK_FUNC(vkGetQueryPoolResults) \ USE_VK_FUNC(vkGetQueueCheckpointDataNV) \ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7a98951..3a80b88 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -254,6 +254,8 @@ #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" #define VK_KHR_8BIT_STORAGE_SPEC_VERSION 1 #define VK_KHR_8BIT_STORAGE_EXTENSION_NAME "VK_KHR_8bit_storage" +#define VK_EXT_EXTERNAL_MEMORY_HOST_SPEC_VERSION 1 +#define VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME "VK_EXT_external_memory_host" #define VK_AMD_BUFFER_MARKER_SPEC_VERSION 1 #define VK_AMD_BUFFER_MARKER_EXTENSION_NAME "VK_AMD_buffer_marker" #define VK_KHR_SHADER_ATOMIC_INT64_SPEC_VERSION 1 @@ -970,6 +972,8 @@ typedef enum VkExternalMemoryHandleTypeFlagBits VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT = 0x00000010, VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT = 0x00000020, VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT = 0x00000040, + VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT = 0x00000080, + VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT = 0x00000100, VK_EXTERNAL_MEMORY_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalMemoryHandleTypeFlagBits; @@ -2077,6 +2081,9 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT = 1000170001, VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = 1000177000, + VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT = 1000178000, + VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, 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, @@ -2637,6 +2644,13 @@ typedef struct VkMemoryBarrier VkAccessFlags dstAccessMask; } VkMemoryBarrier; +typedef struct VkMemoryHostPointerPropertiesEXT +{ + VkStructureType sType; + void *pNext; + uint32_t memoryTypeBits; +} VkMemoryHostPointerPropertiesEXT; + typedef struct VkMemoryRequirements { VkDeviceSize WINE_VK_ALIGN(8) size; @@ -4258,6 +4272,13 @@ typedef struct VkPhysicalDeviceDriverPropertiesKHR VkConformanceVersionKHR conformanceVersion; } VkPhysicalDeviceDriverPropertiesKHR; +typedef struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT +{ + VkStructureType sType; + void *pNext; + VkDeviceSize WINE_VK_ALIGN(8) minImportedHostPointerAlignment; +} VkPhysicalDeviceExternalMemoryHostPropertiesEXT; + typedef struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT { VkStructureType sType; @@ -4867,6 +4888,14 @@ typedef struct VkImageFormatProperties2 VkImageFormatProperties WINE_VK_ALIGN(8) imageFormatProperties; } VkImageFormatProperties2; +typedef struct VkImportMemoryHostPointerInfoEXT +{ + VkStructureType sType; + const void *pNext; + VkExternalMemoryHandleTypeFlagBits handleType; + void *pHostPointer; +} VkImportMemoryHostPointerInfoEXT; + typedef struct VkMemoryHeap { VkDeviceSize WINE_VK_ALIGN(8) size; @@ -5442,6 +5471,7 @@ typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements2)(VkDevice, cons typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2 *, uint32_t *, VkSparseImageMemoryRequirements2 *); typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout *); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetInstanceProcAddr)(VkInstance, const char *); +typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferProperties)(VkPhysicalDevice, const VkPhysicalDeviceExternalBufferInfo *, VkExternalBufferProperties *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR)(VkPhysicalDevice, const VkPhysicalDeviceExternalBufferInfo *, VkExternalBufferProperties *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalFenceProperties)(VkPhysicalDevice, const VkPhysicalDeviceExternalFenceInfo *, VkExternalFenceProperties *); @@ -5702,6 +5732,7 @@ void VKAPI_CALL vkGetImageSparseMemoryRequirements2(VkDevice device, const VkIma void VKAPI_CALL vkGetImageSparseMemoryRequirements2KHR(VkDevice device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements); void VKAPI_CALL vkGetImageSubresourceLayout(VkDevice device, VkImage image, const VkImageSubresource *pSubresource, VkSubresourceLayout *pLayout); PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char *pName); +VkResult VKAPI_CALL vkGetMemoryHostPointerPropertiesEXT(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void *pHostPointer, VkMemoryHostPointerPropertiesEXT *pMemoryHostPointerProperties); void VKAPI_CALL vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties); void VKAPI_CALL vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties); void VKAPI_CALL vkGetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties);

1 0

Józef Kucia : winevulkan: Enable VK_KHR_shader_float16_int8.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: bbfc4f6f0d0a3a94508444e3b11f1edb8260b3fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfc4f6f0d0a3a94508444e3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:54 2019 +0200 winevulkan: Enable VK_KHR_shader_float16_int8. 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 | 18 ++++++++++++++++++ include/wine/vulkan.h | 11 +++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index be3996c..851c554 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -110,7 +110,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_KHR_external_fence_win32", "VK_KHR_external_memory_win32", "VK_KHR_external_semaphore_win32", - "VK_KHR_shader_float16_int8", # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e80bb7c..8794465 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1526,6 +1526,23 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR: + { + const VkPhysicalDeviceFloat16Int8FeaturesKHR *in = (const VkPhysicalDeviceFloat16Int8FeaturesKHR *)in_header; + VkPhysicalDeviceFloat16Int8FeaturesKHR *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->shaderFloat16 = in->shaderFloat16; + out->shaderInt8 = in->shaderInt8; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT: { const VkPhysicalDeviceHostQueryResetFeaturesEXT *in = (const VkPhysicalDeviceHostQueryResetFeaturesEXT *)in_header; @@ -4337,6 +4354,7 @@ static const char * const vk_device_extensions[] = "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_shader_atomic_int64", "VK_KHR_shader_draw_parameters", + "VK_KHR_shader_float16_int8", "VK_KHR_shader_float_controls", "VK_KHR_storage_buffer_storage_class", "VK_KHR_swapchain", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 3a80b88..ecdabe4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -158,6 +158,8 @@ #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" #define VK_EXT_CONDITIONAL_RENDERING_SPEC_VERSION 1 #define VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME "VK_EXT_conditional_rendering" +#define VK_KHR_SHADER_FLOAT16_INT8_SPEC_VERSION 1 +#define VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME "VK_KHR_shader_float16_int8" #define VK_KHR_16BIT_STORAGE_SPEC_VERSION 1 #define VK_KHR_16BIT_STORAGE_EXTENSION_NAME "VK_KHR_16bit_storage" #define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1 @@ -1988,6 +1990,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001, VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = 1000082000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES = 1000083000, VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000, VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO = 1000085000, @@ -3752,6 +3755,14 @@ typedef struct VkPhysicalDeviceExternalImageFormatInfo VkExternalMemoryHandleTypeFlagBits handleType; } VkPhysicalDeviceExternalImageFormatInfo; +typedef struct VkPhysicalDeviceFloat16Int8FeaturesKHR +{ + VkStructureType sType; + void *pNext; + VkBool32 shaderFloat16; + VkBool32 shaderInt8; +} VkPhysicalDeviceFloat16Int8FeaturesKHR; + typedef struct VkPhysicalDeviceGroupProperties { VkStructureType sType;

1 0

Józef Kucia : winevulkan: Enable VK_EXT_ycbcr_image_arrays.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: af3d82ddbea3743b6912aa393a86fc7c9fe5e594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3d82ddbea3743b6912aa39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:55 2019 +0200 winevulkan: Enable VK_EXT_ycbcr_image_arrays. 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 | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 851c554..0aed365 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -105,7 +105,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. "VK_EXT_pipeline_creation_feedback", - "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_display_timing", "VK_KHR_external_fence_win32", "VK_KHR_external_memory_win32", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 8794465..8c9b670 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1945,6 +1945,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT: + { + const VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *in = (const VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *)in_header; + VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->ycbcrImageArrays = in->ycbcrImageArrays; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -4324,6 +4340,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_transform_feedback", "VK_EXT_validation_cache", "VK_EXT_vertex_attribute_divisor", + "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_decorate_string", "VK_GOOGLE_hlsl_functionality1", "VK_IMG_filter_cubic", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index ecdabe4..4545873 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -310,6 +310,8 @@ #define VK_EXT_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_EXT_buffer_device_address" #define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 #define VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME "VK_EXT_separate_stencil_usage" +#define VK_EXT_YCBCR_IMAGE_ARRAYS_SPEC_VERSION 1 +#define VK_EXT_YCBCR_IMAGE_ARRAYS_EXTENSION_NAME "VK_EXT_ycbcr_image_arrays" #define VK_EXT_HOST_QUERY_RESET_SPEC_VERSION 1 #define VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME "VK_EXT_host_query_reset" @@ -2119,6 +2121,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = 1000244001, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = 1000246000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = 1000261000, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7fffffff, } VkStructureType; @@ -3126,6 +3129,13 @@ typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT uint32_t maxVertexAttribDivisor; } VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT; +typedef struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 ycbcrImageArrays; +} VkPhysicalDeviceYcbcrImageArraysFeaturesEXT; + typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT { VkStructureType sType;

1 0

Józef Kucia : winevulkan: Enable VK_NV_dedicated_allocation_image_aliasing.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: ad82739dda15b44510f6003302f0ad17848a35a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad82739dda15b44510f60033… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:57 2019 +0200 winevulkan: Enable VK_NV_dedicated_allocation_image_aliasing. 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 | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9d76f80..2d872e2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -112,7 +112,6 @@ BLACKLISTED_EXTENSIONS = [ # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", - "VK_NV_dedicated_allocation_image_aliasing", # Extensions for other platforms "VK_EXT_external_memory_dma_buf", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 03842f2..f48db3d 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1811,6 +1811,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV: + { + const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *in = (const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *)in_header; + VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->dedicatedAllocationImageAliasing = in->dedicatedAllocationImageAliasing; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV: { const VkPhysicalDeviceShadingRateImageFeaturesNV *in = (const VkPhysicalDeviceShadingRateImageFeaturesNV *)in_header; @@ -4407,6 +4423,7 @@ static const char * const vk_device_extensions[] = "VK_NV_cooperative_matrix", "VK_NV_corner_sampled_image", "VK_NV_dedicated_allocation", + "VK_NV_dedicated_allocation_image_aliasing", "VK_NV_device_diagnostic_checkpoints", "VK_NV_fill_rectangle", "VK_NV_fragment_coverage_to_color", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 50513a1..407b7ef 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -306,6 +306,8 @@ #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_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_SPEC_VERSION 1 +#define VK_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_EXTENSION_NAME "VK_NV_dedicated_allocation_image_aliasing" #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 @@ -2144,6 +2146,7 @@ typedef enum VkStructureType 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_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, 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, @@ -2770,6 +2773,13 @@ typedef struct VkPhysicalDeviceCooperativeMatrixPropertiesNV VkShaderStageFlags cooperativeMatrixSupportedStages; } VkPhysicalDeviceCooperativeMatrixPropertiesNV; +typedef struct VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV +{ + VkStructureType sType; + void *pNext; + VkBool32 dedicatedAllocationImageAliasing; +} VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV; + typedef struct VkPhysicalDeviceDepthStencilResolvePropertiesKHR { VkStructureType sType;

1 0