[PATCH 0/1] MR1541: winevulkan: Don't try to convert unions without selectors.

List overview All Threads

newer

older

[PATCH v2 0/1] MR1541: winevulkan:...

Re: [PATCH v2 0/2] MR1508:...

Jacek Caban (＠jacek)

24 Nov 2022 24 Nov '22

9:08 p.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1541

Show replies by date

Jacek Caban

24 Nov 24 Nov

9:08 p.m.

New subject: [PATCH 1/1] winevulkan: Don't try to convert unions without selectors.

From: Jacek Caban jacek@codeweavers.com

--- dlls/winevulkan/make_vulkan | 6 +++- dlls/winevulkan/vulkan_thunks.c | 58 +++++++++------------------------ 2 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6d07423a5ed..f7d7c383b15 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1284,7 +1284,7 @@ class VkVariable(object): # Collect any member conversions first, so we can guarantee # those functions will be defined prior to usage by the # 'parent' param requiring conversion. - if self.is_struct() or self.is_union(): + if self.is_struct() or (self.is_union() and self.selector): struct = self.struct is_const = self.is_const() if self.is_pointer() else parent_const

@@ -1533,6 +1533,10 @@ class VkMember(VkVariable): def needs_conversion(self, conv, unwrap, direction, struct_const): """ Check if member needs conversion. """

+ # we can't convert unions if we don't have a selector + if self.is_union() and not self.selector: + return False + is_const = self.is_const() if self.is_pointer() else struct_const

# const members don't needs output conversion unless they are structs with non-const pointers diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 2181daf678a..19a985029d8 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -308,12 +308,6 @@ typedef struct VkBindImageMemoryInfo32 } VkBindImageMemoryInfo32; typedef VkBindImageMemoryInfo32 VkBindImageMemoryInfoKHR32;

-typedef union VkDeviceOrHostAddressConstKHR32 -{ - VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress; - PTR32 hostAddress; -} VkDeviceOrHostAddressConstKHR32; - typedef struct VkAccelerationStructureGeometryMotionTrianglesDataNV32 { VkStructureType sType; @@ -380,12 +374,6 @@ typedef struct VkAccelerationStructureGeometryKHR32 VkGeometryFlagsKHR flags; } VkAccelerationStructureGeometryKHR32;

-typedef union VkDeviceOrHostAddressKHR32 -{ - VkDeviceAddress DECLSPEC_ALIGN(8) deviceAddress; - PTR32 hostAddress; -} VkDeviceOrHostAddressKHR32; - typedef struct VkAccelerationStructureBuildGeometryInfoKHR32 { VkStructureType sType; @@ -6597,14 +6585,6 @@ static inline const VkBindImageMemoryInfo *convert_VkBindImageMemoryInfo_array_w return out; }

-static inline void convert_VkDeviceOrHostAddressConstKHR_win32_to_host(const VkDeviceOrHostAddressConstKHR32 *in, VkDeviceOrHostAddressConstKHR *out) -{ - if (!in) return; - - out->deviceAddress = in->deviceAddress; - out->hostAddress = (const void *)UlongToPtr(in->hostAddress); -} - static inline const VkMicromapUsageEXT * const*convert_VkMicromapUsageEXT_pointer_array_win32_to_host(struct conversion_context *ctx, const PTR32 *in, uint32_t count) { VkMicromapUsageEXT **out; @@ -6631,12 +6611,12 @@ static inline void convert_VkAccelerationStructureGeometryTrianglesDataKHR_win32 out->sType = in->sType; out->pNext = NULL; out->vertexFormat = in->vertexFormat; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->vertexData, &out->vertexData); + out->vertexData = in->vertexData; out->vertexStride = in->vertexStride; out->maxVertex = in->maxVertex; out->indexType = in->indexType; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->indexData, &out->indexData); - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->transformData, &out->transformData); + out->indexData = in->indexData; + out->transformData = in->transformData;

for (in_header = UlongToPtr(in->pNext); in_header; in_header = UlongToPtr(in_header->pNext)) { @@ -6648,7 +6628,7 @@ static inline void convert_VkAccelerationStructureGeometryTrianglesDataKHR_win32 const VkAccelerationStructureGeometryMotionTrianglesDataNV32 *in_ext = (const VkAccelerationStructureGeometryMotionTrianglesDataNV32 *)in_header; out_ext->sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_MOTION_TRIANGLES_DATA_NV; out_ext->pNext = NULL; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in_ext->vertexData, &out_ext->vertexData); + out_ext->vertexData = in_ext->vertexData; out_header->pNext = (void *)out_ext; out_header = (void *)out_ext; break; @@ -6660,7 +6640,7 @@ static inline void convert_VkAccelerationStructureGeometryTrianglesDataKHR_win32 out_ext->sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_TRIANGLES_OPACITY_MICROMAP_EXT; out_ext->pNext = NULL; out_ext->indexType = in_ext->indexType; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in_ext->indexBuffer, &out_ext->indexBuffer); + out_ext->indexBuffer = in_ext->indexBuffer; out_ext->indexStride = in_ext->indexStride; out_ext->baseTriangle = in_ext->baseTriangle; out_ext->usageCountsCount = in_ext->usageCountsCount; @@ -6684,7 +6664,7 @@ static inline void convert_VkAccelerationStructureGeometryAabbsDataKHR_win32_to_

out->sType = in->sType; out->pNext = NULL; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->data, &out->data); + out->data = in->data; out->stride = in->stride; if (in->pNext) FIXME("Unexpected pNext\n"); @@ -6697,7 +6677,7 @@ static inline void convert_VkAccelerationStructureGeometryInstancesDataKHR_win32 out->sType = in->sType; out->pNext = NULL; out->arrayOfPointers = in->arrayOfPointers; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->data, &out->data); + out->data = in->data; if (in->pNext) FIXME("Unexpected pNext\n"); } @@ -6765,14 +6745,6 @@ static inline const VkAccelerationStructureGeometryKHR * const*convert_VkAcceler return (void *)out; }

-static inline void convert_VkDeviceOrHostAddressKHR_win32_to_host(const VkDeviceOrHostAddressKHR32 *in, VkDeviceOrHostAddressKHR *out) -{ - if (!in) return; - - out->deviceAddress = in->deviceAddress; - out->hostAddress = (void *)UlongToPtr(in->hostAddress); -} - static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_host(struct conversion_context *ctx, const VkAccelerationStructureBuildGeometryInfoKHR32 *in, VkAccelerationStructureBuildGeometryInfoKHR *out) { if (!in) return; @@ -6787,7 +6759,7 @@ static inline void convert_VkAccelerationStructureBuildGeometryInfoKHR_win32_to_ out->geometryCount = in->geometryCount; out->pGeometries = convert_VkAccelerationStructureGeometryKHR_array_win32_to_host(ctx, (const VkAccelerationStructureGeometryKHR32 *)UlongToPtr(in->pGeometries), in->geometryCount); out->ppGeometries = convert_VkAccelerationStructureGeometryKHR_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppGeometries), in->geometryCount); - convert_VkDeviceOrHostAddressKHR_win32_to_host(&in->scratchData, &out->scratchData); + out->scratchData = in->scratchData; if (in->pNext) FIXME("Unexpected pNext\n"); } @@ -6821,9 +6793,9 @@ static inline void convert_VkMicromapBuildInfoEXT_win32_to_host(struct conversio out->usageCountsCount = in->usageCountsCount; out->pUsageCounts = (const VkMicromapUsageEXT *)UlongToPtr(in->pUsageCounts); out->ppUsageCounts = convert_VkMicromapUsageEXT_pointer_array_win32_to_host(ctx, (const PTR32 *)UlongToPtr(in->ppUsageCounts), in->usageCountsCount); - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->data, &out->data); - convert_VkDeviceOrHostAddressKHR_win32_to_host(&in->scratchData, &out->scratchData); - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->triangleArray, &out->triangleArray); + out->data = in->data; + out->scratchData = in->scratchData; + out->triangleArray = in->triangleArray; out->triangleArrayStride = in->triangleArrayStride; if (in->pNext) FIXME("Unexpected pNext\n"); @@ -7370,7 +7342,7 @@ static inline void convert_VkCopyAccelerationStructureToMemoryInfoKHR_win32_to_h out->sType = in->sType; out->pNext = NULL; out->src = in->src; - convert_VkDeviceOrHostAddressKHR_win32_to_host(&in->dst, &out->dst); + out->dst = in->dst; out->mode = in->mode; if (in->pNext) FIXME("Unexpected pNext\n"); @@ -7609,7 +7581,7 @@ static inline void convert_VkCopyMemoryToAccelerationStructureInfoKHR_win32_to_h

out->sType = in->sType; out->pNext = NULL; - convert_VkDeviceOrHostAddressConstKHR_win32_to_host(&in->src, &out->src); + out->src = in->src; out->dst = in->dst; out->mode = in->mode; if (in->pNext) @@ -7649,7 +7621,7 @@ static inline void convert_VkCopyMicromapToMemoryInfoEXT_win32_to_host(const VkC out->sType = in->sType; out->pNext = NULL; out->src = in->src; - convert_VkDeviceOrHostAddressKHR_win32_to_host(&in->dst, &out->dst); + out->dst = in->dst; out->mode = in->mode; if (in->pNext) FIXME("Unexpected pNext\n");

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1541

Marvin

9:13 p.m.

New subject: [PATCH 1/1] winevulkan: Don't try to convert unions without selectors.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126762

Your paranoid android.

=== debian11 (build log) ===

../wine/dlls/winevulkan/vulkan_thunks.c:315:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:323:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:337:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:349:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:358:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:389:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:403:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:672:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:780:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:789:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressConstKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:808:5: error: expected specifier-qualifier-list before ��VkDeviceOrHostAddressKHR32�� ../wine/dlls/winevulkan/vulkan_thunks.c:6614:25: error: ��VkAccelerationStructureGeometryTrianglesDataKHR32�� has no member named ��vertexData�� ../wine/dlls/winevulkan/vulkan_thunks.c:6615:27: error: ��VkAccelerationStructureGeometryTrianglesDataKHR32�� has no member named ��vertexStride�� ../wine/dlls/winevulkan/vulkan_thunks.c:6616:24: error: ��VkAccelerationStructureGeometryTrianglesDataKHR32�� has no member named ��maxVertex�� ../wine/dlls/winevulkan/vulkan_thunks.c:6617:24: error: ��VkAccelerationStructureGeometryTrianglesDataKHR32�� has no member named ��indexType�� ../wine/dlls/winevulkan/vulkan_thunks.c:6618:24: error: ��VkAccelerationStructureGeometryTrianglesDataKHR32�� has no member named ��indexData�� ../wine/dlls/winevulkan/vulkan_thunks.c:6619:28: error: ��VkAccelerationStructureGeometryTrianglesDataKHR32�� has no member named ��transformData�� ../wine/dlls/winevulkan/vulkan_thunks.c:6631:41: error: ��VkAccelerationStructureGeometryMotionTrianglesDataNV32�� has no member named ��vertexData�� ../wine/dlls/winevulkan/vulkan_thunks.c:6643:42: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��indexBuffer�� ../wine/dlls/winevulkan/vulkan_thunks.c:6644:42: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��indexStride�� ../wine/dlls/winevulkan/vulkan_thunks.c:6645:43: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��baseTriangle�� ../wine/dlls/winevulkan/vulkan_thunks.c:6646:47: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��usageCountsCount�� ../wine/dlls/winevulkan/vulkan_thunks.c:6647:82: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��pUsageCounts�� ../wine/dlls/winevulkan/vulkan_thunks.c:6648:130: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��ppUsageCounts�� ../wine/dlls/winevulkan/vulkan_thunks.c:6648:154: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��usageCountsCount�� ../wine/dlls/winevulkan/vulkan_thunks.c:6649:39: error: ��VkAccelerationStructureTrianglesOpacityMicromapEXT32�� has no member named ��micromap�� ../wine/dlls/winevulkan/vulkan_thunks.c:6667:19: error: ��VkAccelerationStructureGeometryAabbsDataKHR32�� has no member named ��data�� ../wine/dlls/winevulkan/vulkan_thunks.c:6668:21: error: ��VkAccelerationStructureGeometryAabbsDataKHR32�� has no member named ��stride�� ../wine/dlls/winevulkan/vulkan_thunks.c:6680:19: error: ��VkAccelerationStructureGeometryInstancesDataKHR32�� has no member named ��data�� ../wine/dlls/winevulkan/vulkan_thunks.c:6762:26: error: ��VkAccelerationStructureBuildGeometryInfoKHR32�� has no member named ��scratchData�� ../wine/dlls/winevulkan/vulkan_thunks.c:6796:19: error: ��VkMicromapBuildInfoEXT32�� has no member named ��data�� ../wine/dlls/winevulkan/vulkan_thunks.c:6797:26: error: ��VkMicromapBuildInfoEXT32�� has no member named ��scratchData�� ../wine/dlls/winevulkan/vulkan_thunks.c:6798:28: error: ��VkMicromapBuildInfoEXT32�� has no member named ��triangleArray�� ../wine/dlls/winevulkan/vulkan_thunks.c:6799:34: error: ��VkMicromapBuildInfoEXT32�� has no member named ��triangleArrayStride�� ../wine/dlls/winevulkan/vulkan_thunks.c:7345:18: error: ��VkCopyAccelerationStructureToMemoryInfoKHR32�� has no member named ��dst�� ../wine/dlls/winevulkan/vulkan_thunks.c:7346:19: error: ��VkCopyAccelerationStructureToMemoryInfoKHR32�� has no member named ��mode�� ../wine/dlls/winevulkan/vulkan_thunks.c:7584:18: error: ��VkCopyMemoryToAccelerationStructureInfoKHR32�� has no member named ��src�� ../wine/dlls/winevulkan/vulkan_thunks.c:7585:18: error: ��VkCopyMemoryToAccelerationStructureInfoKHR32�� has no member named ��dst�� ../wine/dlls/winevulkan/vulkan_thunks.c:7586:19: error: ��VkCopyMemoryToAccelerationStructureInfoKHR32�� has no member named ��mode�� ../wine/dlls/winevulkan/vulkan_thunks.c:7597:18: error: ��VkCopyMemoryToMicromapInfoEXT32�� has no member named ��src�� ../wine/dlls/winevulkan/vulkan_thunks.c:7598:18: error: ��VkCopyMemoryToMicromapInfoEXT32�� has no member named ��dst�� ../wine/dlls/winevulkan/vulkan_thunks.c:7599:19: error: ��VkCopyMemoryToMicromapInfoEXT32�� has no member named ��mode�� ../wine/dlls/winevulkan/vulkan_thunks.c:7624:18: error: ��VkCopyMicromapToMemoryInfoEXT32�� has no member named ��dst�� ../wine/dlls/winevulkan/vulkan_thunks.c:7625:19: error: ��VkCopyMicromapToMemoryInfoEXT32�� has no member named ��mode�� Task: The win32 Wine build failed

=== debian11b (build log) ===

805

Age (days ago)

805

Last active (days ago)

wine-gitlab@winehq.org

2 comments

3 participants

tags (0)

participants (3)

Jacek Caban
Jacek Caban (＠jacek)
Marvin