January 2021 - Wine-commits

Rémi Bernon : widl: Support WinRT mta threading attribute parsing.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 1abdd8c89a97f15ffee87526c67ef898f1c2b3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abdd8c89a97f15ffee87526… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 15:36:29 2021 +0100 widl: Support WinRT mta threading attribute parsing. As an alias to free-threaded model. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 01c6f800a08..2f5f55905c5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -385,6 +385,7 @@ static const struct keyword attr_keywords[] = {"marshaling_behavior", tMARSHALINGBEHAVIOR, 1}, {"maybe", tMAYBE, 0}, {"message", tMESSAGE, 0}, + {"mta" , tMTA, 0}, {"neutral", tNEUTRAL, 0}, {"nocode", tNOCODE, 0}, {"nonbrowsable", tNONBROWSABLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 48f180cdb49..4ce84cc2440 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -222,6 +222,7 @@ static typelib_t *current_typelib; %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE +%token tMTA %token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE @@ -1154,6 +1155,7 @@ threading_type: | tSINGLE { $$ = THREADING_SINGLE; } | tFREE { $$ = THREADING_FREE; } | tBOTH { $$ = THREADING_BOTH; } + | tMTA { $$ = THREADING_FREE; } ; pointer_type:

1 0

Rémi Bernon : widl: Support WinRT exclusiveto attribute parsing.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 73e0f5e212188714835c1d3eea02c08ffe71a0bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=73e0f5e212188714835c1d3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 15:36:30 2021 +0100 widl: Support WinRT exclusiveto attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 2f5f55905c5..7a811d537d1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -358,6 +358,7 @@ static const struct keyword attr_keywords[] = {"encode", tENCODE, 0}, {"endpoint", tENDPOINT, 0}, {"entry", tENTRY, 0}, + {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, {"force_allocate", tFORCEALLOCATE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4ce84cc2440..351bbd12107 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -196,6 +196,7 @@ static typelib_t *current_typelib; %token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST +%token tEXCLUSIVETO %token tEXPLICITHANDLE tEXTERN %token tFALSE %token tFASTCALL tFAULTSTATUS @@ -561,6 +562,7 @@ attribute: { $$ = NULL; } | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY, $3); } + | tEXCLUSIVETO '(' decl_spec ')' { $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } @@ -2223,6 +2225,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 6c130d4701e..fbaabfbc8c3 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -103,6 +103,7 @@ enum attr_type ATTR_ENCODE, ATTR_ENDPOINT, ATTR_ENTRY, + ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS, ATTR_FORCEALLOCATE,

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 0174f7072e64652f6d0e5d0a312f0917211feb63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0174f7072e64652f6d0e5d0a… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jan 26 13:15:00 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 3136 ++++++++++++++++++++++++-------------------------------------- 1 file changed, 1191 insertions(+), 1945 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0174f7072e64652f6d0e…

1 0

Georg Lehmann : winevulkan: Don't advertise VK_EXT_headless_surface.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 88eb322830af566a83c3d55592cf7898c506a27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=88eb322830af566a83c3d555… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 26 13:32:23 2021 +0100 winevulkan: Don't advertise VK_EXT_headless_surface. This extension never worked. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.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 | 12 ------------ 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6aa126c7169..9cce96aefd3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,6 +86,7 @@ EXT_BLOCK_SIZE = 1000 UNSUPPORTED_EXTENSIONS = [ # Instance extensions + "VK_EXT_headless_surface", # Needs WSI work. "VK_KHR_display", # Needs WSI work. "VK_KHR_surface_protected_capabilities", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 9aec8b1e856..763d75143b8 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5053,12 +5053,6 @@ VkResult WINAPI wine_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache #endif } -static VkResult WINAPI wine_vkCreateHeadlessSurfaceEXT(VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface) -{ - TRACE("%p, %p, %p, %p\n", instance, pCreateInfo, pAllocator, pSurface); - return instance->funcs.p_vkCreateHeadlessSurfaceEXT(instance->instance, pCreateInfo, NULL, pSurface); -} - VkResult WINAPI wine_vkCreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImage *pImage) { TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pImage); @@ -6993,7 +6987,6 @@ static const struct vulkan_func vk_instance_dispatch_table[] = {"vkCreateDebugReportCallbackEXT", &wine_vkCreateDebugReportCallbackEXT}, {"vkCreateDebugUtilsMessengerEXT", &wine_vkCreateDebugUtilsMessengerEXT}, {"vkCreateDevice", &wine_vkCreateDevice}, - {"vkCreateHeadlessSurfaceEXT", &wine_vkCreateHeadlessSurfaceEXT}, {"vkCreateWin32SurfaceKHR", &wine_vkCreateWin32SurfaceKHR}, {"vkDebugReportMessageEXT", &wine_vkDebugReportMessageEXT}, {"vkDestroyDebugReportCallbackEXT", &wine_vkDestroyDebugReportCallbackEXT}, @@ -7253,7 +7246,6 @@ static const char * const vk_instance_extensions[] = { "VK_EXT_debug_report", "VK_EXT_debug_utils", - "VK_EXT_headless_surface", "VK_EXT_swapchain_colorspace", "VK_EXT_validation_features", "VK_EXT_validation_flags", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f42b845dcb0..3fae2979752 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1936,7 +1936,6 @@ struct vulkan_instance_funcs VkResult (*p_vkCreateDebugReportCallbackEXT)(VkInstance, const VkDebugReportCallbackCreateInfoEXT *, const VkAllocationCallbacks *, VkDebugReportCallbackEXT *); VkResult (*p_vkCreateDebugUtilsMessengerEXT)(VkInstance, const VkDebugUtilsMessengerCreateInfoEXT *, const VkAllocationCallbacks *, VkDebugUtilsMessengerEXT *); VkResult (*p_vkCreateDevice)(VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *, VkDevice *); - VkResult (*p_vkCreateHeadlessSurfaceEXT)(VkInstance, const VkHeadlessSurfaceCreateInfoEXT *, const VkAllocationCallbacks *, VkSurfaceKHR *); VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); void (*p_vkDebugReportMessageEXT)(VkInstance, VkDebugReportFlagsEXT, VkDebugReportObjectTypeEXT, uint64_t, size_t, int32_t, const char *, const char *); void (*p_vkDestroyDebugReportCallbackEXT)(VkInstance, VkDebugReportCallbackEXT, const VkAllocationCallbacks *); @@ -2357,7 +2356,6 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCreateDebugReportCallbackEXT) \ USE_VK_FUNC(vkCreateDebugUtilsMessengerEXT) \ USE_VK_FUNC(vkCreateDevice) \ - USE_VK_FUNC(vkCreateHeadlessSurfaceEXT) \ USE_VK_FUNC(vkCreateWin32SurfaceKHR) \ USE_VK_FUNC(vkDebugReportMessageEXT) \ USE_VK_FUNC(vkDestroyDebugReportCallbackEXT) \ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index dedfb3f2984..aed07e7c1e5 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -353,8 +353,6 @@ #define VK_EXT_YCBCR_IMAGE_ARRAYS_EXTENSION_NAME "VK_EXT_ycbcr_image_arrays" #define VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_SPEC_VERSION 1 #define VK_KHR_UNIFORM_BUFFER_STANDARD_LAYOUT_EXTENSION_NAME "VK_KHR_uniform_buffer_standard_layout" -#define VK_EXT_HEADLESS_SURFACE_SPEC_VERSION 1 -#define VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME "VK_EXT_headless_surface" #define VK_KHR_BUFFER_DEVICE_ADDRESS_SPEC_VERSION 1 #define VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_KHR_buffer_device_address" #define VK_EXT_LINE_RASTERIZATION_SPEC_VERSION 1 @@ -3094,7 +3092,6 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT = 1000251000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES = 1000253000, - VK_STRUCTURE_TYPE_HEADLESS_SURFACE_CREATE_INFO_EXT = 1000256000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES = 1000257000, VK_STRUCTURE_TYPE_BUFFER_OPAQUE_CAPTURE_ADDRESS_CREATE_INFO = 1000257002, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO = 1000257003, @@ -5712,13 +5709,6 @@ typedef struct VkGeometryAABBNV VkDeviceSize WINE_VK_ALIGN(8) offset; } VkGeometryAABBNV; -typedef struct VkHeadlessSurfaceCreateInfoEXT -{ - VkStructureType sType; - const void *pNext; - VkHeadlessSurfaceCreateFlagsEXT flags; -} VkHeadlessSurfaceCreateInfoEXT; - typedef struct VkImageMemoryBarrier { VkStructureType sType; @@ -8504,7 +8494,6 @@ typedef VkResult (VKAPI_PTR *PFN_vkCreateEvent)(VkDevice, const VkEventCreateInf typedef VkResult (VKAPI_PTR *PFN_vkCreateFence)(VkDevice, const VkFenceCreateInfo *, const VkAllocationCallbacks *, VkFence *); typedef VkResult (VKAPI_PTR *PFN_vkCreateFramebuffer)(VkDevice, const VkFramebufferCreateInfo *, const VkAllocationCallbacks *, VkFramebuffer *); typedef VkResult (VKAPI_PTR *PFN_vkCreateGraphicsPipelines)(VkDevice, VkPipelineCache, uint32_t, const VkGraphicsPipelineCreateInfo *, const VkAllocationCallbacks *, VkPipeline *); -typedef VkResult (VKAPI_PTR *PFN_vkCreateHeadlessSurfaceEXT)(VkInstance, const VkHeadlessSurfaceCreateInfoEXT *, const VkAllocationCallbacks *, VkSurfaceKHR *); typedef VkResult (VKAPI_PTR *PFN_vkCreateImage)(VkDevice, const VkImageCreateInfo *, const VkAllocationCallbacks *, VkImage *); typedef VkResult (VKAPI_PTR *PFN_vkCreateImageView)(VkDevice, const VkImageViewCreateInfo *, const VkAllocationCallbacks *, VkImageView *); typedef VkResult (VKAPI_PTR *PFN_vkCreateIndirectCommandsLayoutNV)(VkDevice, const VkIndirectCommandsLayoutCreateInfoNV *, const VkAllocationCallbacks *, VkIndirectCommandsLayoutNV *); @@ -8887,7 +8876,6 @@ VkResult VKAPI_CALL vkCreateEvent(VkDevice device, const VkEventCreateInfo *pCre VkResult VKAPI_CALL vkCreateFence(VkDevice device, const VkFenceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFence *pFence); VkResult VKAPI_CALL vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFramebuffer *pFramebuffer); VkResult VKAPI_CALL vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines); -VkResult VKAPI_CALL vkCreateHeadlessSurfaceEXT(VkInstance instance, const VkHeadlessSurfaceCreateInfoEXT *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSurfaceKHR *pSurface); VkResult VKAPI_CALL vkCreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImage *pImage); VkResult VKAPI_CALL vkCreateImageView(VkDevice device, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImageView *pView); VkResult VKAPI_CALL vkCreateIndirectCommandsLayoutNV(VkDevice device, const VkIndirectCommandsLayoutCreateInfoNV *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkIndirectCommandsLayoutNV *pIndirectCommandsLayout);

1 0

Georg Lehmann : winevulkan: Fix surface functions if they aren't called by winevulkan.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: c1824d578ac514d29e79a5a00d6759f11dbe4813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1824d578ac514d29e79a5a0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 26 13:32:24 2021 +0100 winevulkan: Fix surface functions if they aren't called by winevulkan. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50549 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 15 ++++++++-- dlls/winevulkan/make_vulkan | 60 ++++++++++++++-------------------------- dlls/winevulkan/vulkan.c | 45 +++++++++++++++++++++++++----- dlls/winevulkan/vulkan_private.h | 3 +- dlls/winevulkan/vulkan_thunks.c | 24 ++++++---------- dlls/winevulkan/vulkan_thunks.h | 4 +++ dlls/winex11.drv/vulkan.c | 15 ++++++++-- include/wine/vulkan_driver.h | 31 +++------------------ 8 files changed, 103 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1824d578ac514d29e79…

1 0

Liam Middlebrook : winevulkan: Skip commands which are declared but not defined.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 60eff6d65a51b5fd52d0b22754c88976a244917e URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eff6d65a51b5fd52d0b227… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jan 25 07:16:34 2021 -0800 winevulkan: Skip commands which are declared but not defined. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 40978a8fc7a..f4c5065ccd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2936,7 +2936,13 @@ class VkRegistry(object): commands = ext.findall("require/command") for command in commands: cmd_name = command.attrib["name"] - self.funcs[cmd_name].extensions.append(ext_name) + # Need to verify that the command is defined, and otherwise skip it. + # vkCreateScreenSurfaceQNX is declared in <extensions> but not defined in + # <commands>. A command without a definition cannot be enabled, so it's valid for + # the XML file to handle this, but because of the manner in which we parse the XML + # file we pre-populate from <commands> before we check if a command is enabled. + if cmd_name in self.funcs: + self.funcs[cmd_name].extensions.append(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled":

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.168.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: c681a0732fc3c6466b228417bb5e0d518d26b819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c681a0732fc3c6466b228417… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jan 25 07:16:35 2021 -0800 winevulkan: Update to VK spec version 1.2.168. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 63 ++++++++++++++++++++++++++++------------- 4 files changed, 82 insertions(+), 22 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f4c5065ccd9..6aa126c7169 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.166" +VK_XML_VERSION = "1.2.168" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 0ea713be6cf..9aec8b1e856 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3231,6 +3231,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR: + { + const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR *in = (const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR *)in_header; + VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->shaderZeroInitializeWorkgroupMemory = in->shaderZeroInitializeWorkgroupMemory; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: { const VkPhysicalDeviceRobustness2FeaturesEXT *in = (const VkPhysicalDeviceRobustness2FeaturesEXT *)in_header; @@ -3265,6 +3281,25 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR: + { + const VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *in = (const VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *)in_header; + VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->workgroupMemoryExplicitLayout = in->workgroupMemoryExplicitLayout; + out->workgroupMemoryExplicitLayoutScalarBlockLayout = in->workgroupMemoryExplicitLayoutScalarBlockLayout; + out->workgroupMemoryExplicitLayout8BitAccess = in->workgroupMemoryExplicitLayout8BitAccess; + out->workgroupMemoryExplicitLayout16BitAccess = in->workgroupMemoryExplicitLayout16BitAccess; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT: { const VkPhysicalDevice4444FormatsFeaturesEXT *in = (const VkPhysicalDevice4444FormatsFeaturesEXT *)in_header; @@ -7177,6 +7212,8 @@ static const char * const vk_device_extensions[] = "VK_KHR_uniform_buffer_standard_layout", "VK_KHR_variable_pointers", "VK_KHR_vulkan_memory_model", + "VK_KHR_workgroup_memory_explicit_layout", + "VK_KHR_zero_initialize_workgroup_memory", "VK_NV_clip_space_w_scaling", "VK_NV_compute_shader_derivatives", "VK_NV_cooperative_matrix", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 3cee1b05713..e502d0139e8 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.166" + "api_version": "1.2.168" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index baf5a1829d5..dedfb3f2984 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -397,6 +397,8 @@ #define VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME "VK_NV_device_diagnostics_config" #define VK_QCOM_render_pass_store_ops_SPEC_VERSION 2 #define VK_QCOM_render_pass_store_ops_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" +#define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION 1 +#define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_EXTENSION_NAME "VK_KHR_zero_initialize_workgroup_memory" #define VK_NV_FRAGMENT_SHADING_RATE_ENUMS_SPEC_VERSION 1 #define VK_NV_FRAGMENT_SHADING_RATE_ENUMS_EXTENSION_NAME "VK_NV_fragment_shading_rate_enums" #define VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION 1 @@ -405,6 +407,8 @@ #define VK_QCOM_rotated_copy_commands_EXTENSION_NAME "VK_QCOM_rotated_copy_commands" #define VK_EXT_IMAGE_ROBUSTNESS_SPEC_VERSION 1 #define VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME "VK_EXT_image_robustness" +#define VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_SPEC_VERSION 1 +#define VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME "VK_KHR_workgroup_memory_explicit_layout" #define VK_KHR_COPY_COMMANDS_2_SPEC_VERSION 1 #define VK_KHR_COPY_COMMANDS_2_EXTENSION_NAME "VK_KHR_copy_commands2" #define VK_EXT_4444_FORMATS_SPEC_VERSION 1 @@ -426,7 +430,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 166 +#define VK_HEADER_VERSION 168 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -3133,6 +3137,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = 1000325000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV = 1000326001, VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV = 1000326002, @@ -3140,6 +3145,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM = 1000333000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = 1000335000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR = 1000336000, VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR = 1000337000, VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR = 1000337001, VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR = 1000337002, @@ -4934,12 +4940,22 @@ typedef struct VkPhysicalDeviceVulkanMemoryModelFeatures } VkPhysicalDeviceVulkanMemoryModelFeatures; typedef VkPhysicalDeviceVulkanMemoryModelFeatures VkPhysicalDeviceVulkanMemoryModelFeaturesKHR; -typedef struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT +typedef struct VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR { VkStructureType sType; void *pNext; - VkBool32 ycbcrImageArrays; -} VkPhysicalDeviceYcbcrImageArraysFeaturesEXT; + VkBool32 workgroupMemoryExplicitLayout; + VkBool32 workgroupMemoryExplicitLayoutScalarBlockLayout; + VkBool32 workgroupMemoryExplicitLayout8BitAccess; + VkBool32 workgroupMemoryExplicitLayout16BitAccess; +} VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR; + +typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR +{ + VkStructureType sType; + void *pNext; + VkBool32 shaderZeroInitializeWorkgroupMemory; +} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR; typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT { @@ -6184,14 +6200,24 @@ typedef struct VkPhysicalDeviceVulkan12Properties VkSampleCountFlags framebufferIntegerColorSampleCounts; } VkPhysicalDeviceVulkan12Properties; -typedef struct VkPipelineCacheCreateInfo +typedef struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT { VkStructureType sType; - const void *pNext; - VkPipelineCacheCreateFlags flags; - size_t initialDataSize; - const void *pInitialData; -} VkPipelineCacheCreateInfo; + void *pNext; + VkBool32 ycbcrImageArrays; +} VkPhysicalDeviceYcbcrImageArraysFeaturesEXT; + +typedef struct VkPipelineColorBlendAttachmentState +{ + VkBool32 blendEnable; + VkBlendFactor srcColorBlendFactor; + VkBlendFactor dstColorBlendFactor; + VkBlendOp colorBlendOp; + VkBlendFactor srcAlphaBlendFactor; + VkBlendFactor dstAlphaBlendFactor; + VkBlendOp alphaBlendOp; + VkColorComponentFlags colorWriteMask; +} VkPipelineColorBlendAttachmentState; typedef struct VkPipelineCoverageModulationStateCreateInfoNV { @@ -7046,17 +7072,14 @@ typedef struct VkPhysicalDeviceVulkan11Properties VkDeviceSize WINE_VK_ALIGN(8) maxMemoryAllocationSize; } VkPhysicalDeviceVulkan11Properties; -typedef struct VkPipelineColorBlendAttachmentState +typedef struct VkPipelineCacheCreateInfo { - VkBool32 blendEnable; - VkBlendFactor srcColorBlendFactor; - VkBlendFactor dstColorBlendFactor; - VkBlendOp colorBlendOp; - VkBlendFactor srcAlphaBlendFactor; - VkBlendFactor dstAlphaBlendFactor; - VkBlendOp alphaBlendOp; - VkColorComponentFlags colorWriteMask; -} VkPipelineColorBlendAttachmentState; + VkStructureType sType; + const void *pNext; + VkPipelineCacheCreateFlags flags; + size_t initialDataSize; + const void *pInitialData; +} VkPipelineCacheCreateInfo; typedef struct VkPipelineCoverageToColorStateCreateInfoNV {

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in event_sink().
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 16898714b15abe2a17476433a486558abbc95f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16898714b15abe2a17476433… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:02 2021 -0600 winegstreamer: Avoid using Wine debug functions in event_sink(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5401d942a41..8ded4aeef31 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -705,7 +705,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) struct parser_source *pin = gst_pad_get_element_private(pad); struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); + GST_LOG("pin %p, type \"%s\".", pin, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -719,7 +719,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (segment->format != GST_FORMAT_TIME) { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); break; } @@ -798,7 +798,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); } gst_event_unref(event); return TRUE;

1 0

Zebediah Figura : winegstreamer: Don't force event_sink() onto a Wine thread.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 72a05ba397a3e650b5f3874076f8ecc3fd2b5c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a05ba397a3e650b5f38740… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:03 2021 -0600 winegstreamer: Don't force event_sink() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 5b163e40201..ce7c0de4e1a 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -203,19 +203,6 @@ gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) return cbdata.u.event_src_data.ret; } -gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) -{ - struct cb_data cbdata = { EVENT_SINK }; - - cbdata.u.event_sink_data.pad = pad; - cbdata.u.event_sink_data.parent = parent; - cbdata.u.event_sink_data.event = event; - - call_cb(&cbdata); - - return cbdata.u.event_sink_data.ret; -} - void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { REMOVED_DECODED_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 2de829f72e3..29aa2bd662c 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -35,7 +35,6 @@ enum CB_TYPE { ACTIVATE_MODE, REQUEST_BUFFER_SRC, EVENT_SRC, - EVENT_SINK, REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, @@ -95,12 +94,6 @@ struct cb_data { GstEvent *event; gboolean ret; } event_src_data; - struct event_sink_data { - GstPad *pad; - GstObject *parent; - GstEvent *event; - gboolean ret; - } event_sink_data; struct pad_removed_data { GstElement *element; GstPad *pad; @@ -129,7 +122,6 @@ gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; -gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8ded4aeef31..68459a5133c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2379,7 +2379,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin); gst_pad_set_chain_function(pin->my_sink, got_data_sink); - gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); + gst_pad_set_event_function(pin->my_sink, event_sink); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); filter->sources[filter->source_count++] = pin; @@ -2459,12 +2459,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.event_src_data.ret = event_src(data->pad, data->parent, data->event); break; } - case EVENT_SINK: - { - struct event_sink_data *data = &cbdata->u.event_sink_data; - cbdata->u.event_sink_data.ret = event_sink(data->pad, data->parent, data->event); - break; - } case REMOVED_DECODED_PAD: { struct pad_removed_data *data = &cbdata->u.pad_removed_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debugging functions in event_src().
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 3ed270206a918a4fc15fc80c0d4807e0d635d112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed270206a918a4fc15fc80c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:04 2021 -0600 winegstreamer: Avoid using Wine debugging functions in event_src(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 68459a5133c..3efec0f5295 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -622,7 +622,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) if (seek_format != GST_FORMAT_BYTES) { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(seek_format)); + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(seek_format)); return FALSE; } @@ -657,7 +657,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) struct parser *This = gst_pad_get_element_private(pad); gboolean ret = TRUE; - TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); + GST_LOG("filter %p, type \"%s\".", This, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -672,7 +672,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) break; default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); ret = FALSE; break; }

1 0