From: Jacek Caban jacek@codeweavers.com
--- dlls/winevulkan/make_vulkan | 166 ++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 92 deletions(-)
diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 381fe281b4d..99bad6b4c57 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1139,20 +1139,83 @@ class VkHandle(object): def needs_unwrapping(self): return self.is_wrapped()
-class VkMember(object): - def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): +class VkVariable(object): + def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, + dyn_array_len=None, object_type=None): self.const = const - self.struct_fwd_decl = struct_fwd_decl + self.type_info = type_info + self.type = type self.name = name self.pointer = pointer - self.type = _type - self.type_info = None self.array_len = array_len self.dyn_array_len = dyn_array_len + self.object_type = object_type + if type_info: + self.set_type_info(type_info) + + def set_type_info(self, type_info): + """ Helper function to set type information from the type registry. + This is needed, because not all type data is available at time of + parsing. + """ + self.type_info = type_info + self.handle = type_info["data"] if type_info["category"] == "handle" else None + self.struct = type_info["data"] if type_info["category"] == "struct" else None + + def is_const(self): + return self.const + + def is_pointer(self): + return self.pointer is not None + + def is_handle(self): + return self.handle is not None + + def is_struct(self): + return self.struct is not None + + def is_dynamic_array(self): + """ Returns if the member is an array element. + Vulkan uses this for dynamically sized arrays for which + there is a 'count' parameter. + """ + return self.dyn_array_len is not None + + def is_static_array(self): + """ Returns if the member is an array. + Vulkan uses this often for fixed size arrays in which the + length is part of the member. + """ + return self.array_len is not None + + def needs_alignment(self): + """ Check if this member needs alignment for 64-bit data. + Various structures need alignment on 64-bit variables due + to compiler differences on 32-bit between Win32 and Linux. + """ + + if self.is_pointer(): + return False + elif self.type == "size_t": + return False + elif self.type in ["uint64_t", "VkDeviceSize"]: + return True + elif self.is_struct(): + return self.struct.needs_alignment() + elif self.is_handle(): + # Dispatchable handles are pointers to objects, while + # non-dispatchable are uint64_t and hence need alignment. + return not self.handle.is_dispatchable() + return False + +class VkMember(VkVariable): + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): + VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_len=array_len, + dyn_array_len=dyn_array_len, object_type=object_type) + self.struct_fwd_decl = struct_fwd_decl self.optional = optional self.values = values - self.object_type = object_type self.bit_width = bit_width
def __eq__(self, other): @@ -1379,32 +1442,6 @@ class VkMember(object):
return conversions
- def is_const(self): - return self.const - - def is_dynamic_array(self): - """ Returns if the member is an array element. - Vulkan uses this for dynamically sized arrays for which - there is a 'count' parameter. - """ - return self.dyn_array_len is not None - - def is_handle(self): - return self.type_info["category"] == "handle" - - def is_pointer(self): - return self.pointer is not None - - def is_static_array(self): - """ Returns if the member is an array. - Vulkan uses this often for fixed size arrays in which the - length is part of the member. - """ - return self.array_len is not None - - def is_struct(self): - return self.type_info["category"] == "struct" - def is_struct_forward_declaration(self): return self.struct_fwd_decl
@@ -1421,28 +1458,6 @@ class VkMember(object): def is_bit_field(self): return self.bit_width is not None
- def needs_alignment(self): - """ Check if this member needs alignment for 64-bit data. - Various structures need alignment on 64-bit variables due - to compiler differences on 32-bit between Win32 and Linux. - """ - - if self.is_pointer(): - return False - elif self.type == "size_t": - return False - elif self.type in ["uint64_t", "VkDeviceSize"]: - return True - elif self.is_struct(): - struct = self.type_info["data"] - return struct.needs_alignment() - elif self.is_handle(): - # Dispatchable handles are pointers to objects, while - # non-dispatchable are uint64_t and hence need alignment. - handle = self.type_info["data"] - return False if handle.is_dispatchable() else True - return False - def needs_conversion(self): """ Structures requiring alignment, need conversion between win32 and host. """
@@ -1486,28 +1501,13 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_struct_extensions_conversion()
- def set_type_info(self, type_info): - """ Helper function to set type information from the type registry. - This is needed, because not all type data is available at time of - parsing. - """ - self.type_info = type_info - - -class VkParam(object): +class VkParam(VkVariable): """ Helper class which describes a parameter to a function call. """
def __init__(self, type_info, const=None, pointer=None, name=None, array_len=None, dyn_array_len=None, object_type=None): - self.const = const - self.name = name - self.array_len = array_len - self.dyn_array_len = dyn_array_len - self.pointer = pointer - self.object_type = object_type - self.type_info = type_info - self.type = type_info["name"] # For convenience - self.handle = type_info["data"] if type_info["category"] == "handle" else None - self.struct = type_info["data"] if type_info["category"] == "struct" else None + VkVariable.__init__(self, const=const, type_info=type_info, type=type_info["name"], name=name, + pointer=pointer, array_len=array_len, dyn_array_len=dyn_array_len, + object_type=object_type)
self._set_direction() self._set_format_string() @@ -1767,30 +1767,12 @@ class VkParam(object):
return conversions
- def is_const(self): - return self.const is not None - - def is_dynamic_array(self): - return self.dyn_array_len is not None - def is_dispatchable(self): if not self.is_handle(): return False
return self.handle.is_dispatchable()
- def is_handle(self): - return self.handle is not None - - def is_pointer(self): - return self.pointer is not None - - def is_static_array(self): - return self.array_len is not None - - def is_struct(self): - return self.struct is not None - def needs_conversion(self): """ Returns if parameter needs conversion between win32 and host. """
From: Jacek Caban jacek@codeweavers.com
--- dlls/winevulkan/loader_thunks.h | 512 ++++++++++++++++---------------- dlls/winevulkan/make_vulkan | 6 +- 2 files changed, 257 insertions(+), 261 deletions(-)
diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index 410041ef51c..57fbacb31ef 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -480,8 +480,6 @@ enum unix_call unix_count, };
-#include "pshpack4.h" - struct vkAcquireNextImage2KHR_params { VkDevice device; @@ -492,10 +490,10 @@ struct vkAcquireNextImage2KHR_params struct vkAcquireNextImageKHR_params { VkDevice device; - VkSwapchainKHR swapchain; - uint64_t timeout; - VkSemaphore semaphore; - VkFence fence; + VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain; + uint64_t DECLSPEC_ALIGN(8) timeout; + VkSemaphore DECLSPEC_ALIGN(8) semaphore; + VkFence DECLSPEC_ALIGN(8) fence; uint32_t *pImageIndex; };
@@ -550,9 +548,9 @@ struct vkBindAccelerationStructureMemoryNV_params struct vkBindBufferMemory_params { VkDevice device; - VkBuffer buffer; - VkDeviceMemory memory; - VkDeviceSize memoryOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; + VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset; };
struct vkBindBufferMemory2_params @@ -572,9 +570,9 @@ struct vkBindBufferMemory2KHR_params struct vkBindImageMemory_params { VkDevice device; - VkImage image; - VkDeviceMemory memory; - VkDeviceSize memoryOffset; + VkImage DECLSPEC_ALIGN(8) image; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; + VkDeviceSize DECLSPEC_ALIGN(8) memoryOffset; };
struct vkBindImageMemory2_params @@ -594,7 +592,7 @@ struct vkBindImageMemory2KHR_params struct vkBuildAccelerationStructuresKHR_params { VkDevice device; - VkDeferredOperationKHR deferredOperation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation; uint32_t infoCount; const VkAccelerationStructureBuildGeometryInfoKHR *pInfos; const VkAccelerationStructureBuildRangeInfoKHR * const*ppBuildRangeInfos; @@ -615,7 +613,7 @@ struct vkCmdBeginDebugUtilsLabelEXT_params struct vkCmdBeginQuery_params { VkCommandBuffer commandBuffer; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; VkQueryControlFlags flags; }; @@ -623,7 +621,7 @@ struct vkCmdBeginQuery_params struct vkCmdBeginQueryIndexedEXT_params { VkCommandBuffer commandBuffer; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; VkQueryControlFlags flags; uint32_t index; @@ -675,7 +673,7 @@ struct vkCmdBindDescriptorSets_params { VkCommandBuffer commandBuffer; VkPipelineBindPoint pipelineBindPoint; - VkPipelineLayout layout; + VkPipelineLayout DECLSPEC_ALIGN(8) layout; uint32_t firstSet; uint32_t descriptorSetCount; const VkDescriptorSet *pDescriptorSets; @@ -686,15 +684,15 @@ struct vkCmdBindDescriptorSets_params struct vkCmdBindIndexBuffer_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; VkIndexType indexType; };
struct vkCmdBindInvocationMaskHUAWEI_params { VkCommandBuffer commandBuffer; - VkImageView imageView; + VkImageView DECLSPEC_ALIGN(8) imageView; VkImageLayout imageLayout; };
@@ -702,21 +700,21 @@ struct vkCmdBindPipeline_params { VkCommandBuffer commandBuffer; VkPipelineBindPoint pipelineBindPoint; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; };
struct vkCmdBindPipelineShaderGroupNV_params { VkCommandBuffer commandBuffer; VkPipelineBindPoint pipelineBindPoint; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; uint32_t groupIndex; };
struct vkCmdBindShadingRateImageNV_params { VkCommandBuffer commandBuffer; - VkImageView imageView; + VkImageView DECLSPEC_ALIGN(8) imageView; VkImageLayout imageLayout; };
@@ -764,9 +762,9 @@ struct vkCmdBindVertexBuffers2EXT_params struct vkCmdBlitImage_params { VkCommandBuffer commandBuffer; - VkImage srcImage; + VkImage DECLSPEC_ALIGN(8) srcImage; VkImageLayout srcImageLayout; - VkImage dstImage; + VkImage DECLSPEC_ALIGN(8) dstImage; VkImageLayout dstImageLayout; uint32_t regionCount; const VkImageBlit *pRegions; @@ -789,13 +787,13 @@ struct vkCmdBuildAccelerationStructureNV_params { VkCommandBuffer commandBuffer; const VkAccelerationStructureInfoNV *pInfo; - VkBuffer instanceData; - VkDeviceSize instanceOffset; + VkBuffer DECLSPEC_ALIGN(8) instanceData; + VkDeviceSize DECLSPEC_ALIGN(8) instanceOffset; VkBool32 update; - VkAccelerationStructureNV dst; - VkAccelerationStructureNV src; - VkBuffer scratch; - VkDeviceSize scratchOffset; + VkAccelerationStructureNV DECLSPEC_ALIGN(8) dst; + VkAccelerationStructureNV DECLSPEC_ALIGN(8) src; + VkBuffer DECLSPEC_ALIGN(8) scratch; + VkDeviceSize DECLSPEC_ALIGN(8) scratchOffset; };
struct vkCmdBuildAccelerationStructuresIndirectKHR_params @@ -828,7 +826,7 @@ struct vkCmdClearAttachments_params struct vkCmdClearColorImage_params { VkCommandBuffer commandBuffer; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; VkImageLayout imageLayout; const VkClearColorValue *pColor; uint32_t rangeCount; @@ -838,7 +836,7 @@ struct vkCmdClearColorImage_params struct vkCmdClearDepthStencilImage_params { VkCommandBuffer commandBuffer; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; VkImageLayout imageLayout; const VkClearDepthStencilValue *pDepthStencil; uint32_t rangeCount; @@ -854,8 +852,8 @@ struct vkCmdCopyAccelerationStructureKHR_params struct vkCmdCopyAccelerationStructureNV_params { VkCommandBuffer commandBuffer; - VkAccelerationStructureNV dst; - VkAccelerationStructureNV src; + VkAccelerationStructureNV DECLSPEC_ALIGN(8) dst; + VkAccelerationStructureNV DECLSPEC_ALIGN(8) src; VkCopyAccelerationStructureModeKHR mode; };
@@ -868,8 +866,8 @@ struct vkCmdCopyAccelerationStructureToMemoryKHR_params struct vkCmdCopyBuffer_params { VkCommandBuffer commandBuffer; - VkBuffer srcBuffer; - VkBuffer dstBuffer; + VkBuffer DECLSPEC_ALIGN(8) srcBuffer; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; uint32_t regionCount; const VkBufferCopy *pRegions; }; @@ -889,8 +887,8 @@ struct vkCmdCopyBuffer2KHR_params struct vkCmdCopyBufferToImage_params { VkCommandBuffer commandBuffer; - VkBuffer srcBuffer; - VkImage dstImage; + VkBuffer DECLSPEC_ALIGN(8) srcBuffer; + VkImage DECLSPEC_ALIGN(8) dstImage; VkImageLayout dstImageLayout; uint32_t regionCount; const VkBufferImageCopy *pRegions; @@ -911,9 +909,9 @@ struct vkCmdCopyBufferToImage2KHR_params struct vkCmdCopyImage_params { VkCommandBuffer commandBuffer; - VkImage srcImage; + VkImage DECLSPEC_ALIGN(8) srcImage; VkImageLayout srcImageLayout; - VkImage dstImage; + VkImage DECLSPEC_ALIGN(8) dstImage; VkImageLayout dstImageLayout; uint32_t regionCount; const VkImageCopy *pRegions; @@ -934,9 +932,9 @@ struct vkCmdCopyImage2KHR_params struct vkCmdCopyImageToBuffer_params { VkCommandBuffer commandBuffer; - VkImage srcImage; + VkImage DECLSPEC_ALIGN(8) srcImage; VkImageLayout srcImageLayout; - VkBuffer dstBuffer; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; uint32_t regionCount; const VkBufferImageCopy *pRegions; }; @@ -962,12 +960,12 @@ struct vkCmdCopyMemoryToAccelerationStructureKHR_params struct vkCmdCopyQueryPoolResults_params { VkCommandBuffer commandBuffer; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; uint32_t queryCount; - VkBuffer dstBuffer; - VkDeviceSize dstOffset; - VkDeviceSize stride; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) dstOffset; + VkDeviceSize DECLSPEC_ALIGN(8) stride; VkQueryResultFlags flags; };
@@ -1027,8 +1025,8 @@ struct vkCmdDispatchBaseKHR_params struct vkCmdDispatchIndirect_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; };
struct vkCmdDraw_params @@ -1053,8 +1051,8 @@ struct vkCmdDrawIndexed_params struct vkCmdDrawIndexedIndirect_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; uint32_t drawCount; uint32_t stride; }; @@ -1062,10 +1060,10 @@ struct vkCmdDrawIndexedIndirect_params struct vkCmdDrawIndexedIndirectCount_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1073,10 +1071,10 @@ struct vkCmdDrawIndexedIndirectCount_params struct vkCmdDrawIndexedIndirectCountAMD_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1084,10 +1082,10 @@ struct vkCmdDrawIndexedIndirectCountAMD_params struct vkCmdDrawIndexedIndirectCountKHR_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1095,8 +1093,8 @@ struct vkCmdDrawIndexedIndirectCountKHR_params struct vkCmdDrawIndirect_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; uint32_t drawCount; uint32_t stride; }; @@ -1106,8 +1104,8 @@ struct vkCmdDrawIndirectByteCountEXT_params VkCommandBuffer commandBuffer; uint32_t instanceCount; uint32_t firstInstance; - VkBuffer counterBuffer; - VkDeviceSize counterBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) counterBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) counterBufferOffset; uint32_t counterOffset; uint32_t vertexStride; }; @@ -1115,10 +1113,10 @@ struct vkCmdDrawIndirectByteCountEXT_params struct vkCmdDrawIndirectCount_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1126,10 +1124,10 @@ struct vkCmdDrawIndirectCount_params struct vkCmdDrawIndirectCountAMD_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1137,10 +1135,10 @@ struct vkCmdDrawIndirectCountAMD_params struct vkCmdDrawIndirectCountKHR_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1156,10 +1154,10 @@ struct vkCmdDrawMeshTasksEXT_params struct vkCmdDrawMeshTasksIndirectCountEXT_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1167,10 +1165,10 @@ struct vkCmdDrawMeshTasksIndirectCountEXT_params struct vkCmdDrawMeshTasksIndirectCountNV_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; - VkBuffer countBuffer; - VkDeviceSize countBufferOffset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkBuffer DECLSPEC_ALIGN(8) countBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) countBufferOffset; uint32_t maxDrawCount; uint32_t stride; }; @@ -1178,8 +1176,8 @@ struct vkCmdDrawMeshTasksIndirectCountNV_params struct vkCmdDrawMeshTasksIndirectEXT_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; uint32_t drawCount; uint32_t stride; }; @@ -1187,8 +1185,8 @@ struct vkCmdDrawMeshTasksIndirectEXT_params struct vkCmdDrawMeshTasksIndirectNV_params { VkCommandBuffer commandBuffer; - VkBuffer buffer; - VkDeviceSize offset; + VkBuffer DECLSPEC_ALIGN(8) buffer; + VkDeviceSize DECLSPEC_ALIGN(8) offset; uint32_t drawCount; uint32_t stride; }; @@ -1234,14 +1232,14 @@ struct vkCmdEndDebugUtilsLabelEXT_params struct vkCmdEndQuery_params { VkCommandBuffer commandBuffer; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; };
struct vkCmdEndQueryIndexedEXT_params { VkCommandBuffer commandBuffer; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; uint32_t index; }; @@ -1299,9 +1297,9 @@ struct vkCmdExecuteGeneratedCommandsNV_params struct vkCmdFillBuffer_params { VkCommandBuffer commandBuffer; - VkBuffer dstBuffer; - VkDeviceSize dstOffset; - VkDeviceSize size; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) dstOffset; + VkDeviceSize DECLSPEC_ALIGN(8) size; uint32_t data; };
@@ -1366,7 +1364,7 @@ struct vkCmdPreprocessGeneratedCommandsNV_params struct vkCmdPushConstants_params { VkCommandBuffer commandBuffer; - VkPipelineLayout layout; + VkPipelineLayout DECLSPEC_ALIGN(8) layout; VkShaderStageFlags stageFlags; uint32_t offset; uint32_t size; @@ -1377,7 +1375,7 @@ struct vkCmdPushDescriptorSetKHR_params { VkCommandBuffer commandBuffer; VkPipelineBindPoint pipelineBindPoint; - VkPipelineLayout layout; + VkPipelineLayout DECLSPEC_ALIGN(8) layout; uint32_t set; uint32_t descriptorWriteCount; const VkWriteDescriptorSet *pDescriptorWrites; @@ -1386,8 +1384,8 @@ struct vkCmdPushDescriptorSetKHR_params struct vkCmdPushDescriptorSetWithTemplateKHR_params { VkCommandBuffer commandBuffer; - VkDescriptorUpdateTemplate descriptorUpdateTemplate; - VkPipelineLayout layout; + VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate; + VkPipelineLayout DECLSPEC_ALIGN(8) layout; uint32_t set; const void *pData; }; @@ -1395,28 +1393,28 @@ struct vkCmdPushDescriptorSetWithTemplateKHR_params struct vkCmdResetEvent_params { VkCommandBuffer commandBuffer; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; VkPipelineStageFlags stageMask; };
struct vkCmdResetEvent2_params { VkCommandBuffer commandBuffer; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; VkPipelineStageFlags2 stageMask; };
struct vkCmdResetEvent2KHR_params { VkCommandBuffer commandBuffer; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; VkPipelineStageFlags2 stageMask; };
struct vkCmdResetQueryPool_params { VkCommandBuffer commandBuffer; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; uint32_t queryCount; }; @@ -1424,9 +1422,9 @@ struct vkCmdResetQueryPool_params struct vkCmdResolveImage_params { VkCommandBuffer commandBuffer; - VkImage srcImage; + VkImage DECLSPEC_ALIGN(8) srcImage; VkImageLayout srcImageLayout; - VkImage dstImage; + VkImage DECLSPEC_ALIGN(8) dstImage; VkImageLayout dstImageLayout; uint32_t regionCount; const VkImageResolve *pRegions; @@ -1581,21 +1579,21 @@ struct vkCmdSetDiscardRectangleEXT_params struct vkCmdSetEvent_params { VkCommandBuffer commandBuffer; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; VkPipelineStageFlags stageMask; };
struct vkCmdSetEvent2_params { VkCommandBuffer commandBuffer; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; const VkDependencyInfo *pDependencyInfo; };
struct vkCmdSetEvent2KHR_params { VkCommandBuffer commandBuffer; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; const VkDependencyInfo *pDependencyInfo; };
@@ -1882,17 +1880,17 @@ struct vkCmdTraceRaysKHR_params struct vkCmdTraceRaysNV_params { VkCommandBuffer commandBuffer; - VkBuffer raygenShaderBindingTableBuffer; - VkDeviceSize raygenShaderBindingOffset; - VkBuffer missShaderBindingTableBuffer; - VkDeviceSize missShaderBindingOffset; - VkDeviceSize missShaderBindingStride; - VkBuffer hitShaderBindingTableBuffer; - VkDeviceSize hitShaderBindingOffset; - VkDeviceSize hitShaderBindingStride; - VkBuffer callableShaderBindingTableBuffer; - VkDeviceSize callableShaderBindingOffset; - VkDeviceSize callableShaderBindingStride; + VkBuffer DECLSPEC_ALIGN(8) raygenShaderBindingTableBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) raygenShaderBindingOffset; + VkBuffer DECLSPEC_ALIGN(8) missShaderBindingTableBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) missShaderBindingOffset; + VkDeviceSize DECLSPEC_ALIGN(8) missShaderBindingStride; + VkBuffer DECLSPEC_ALIGN(8) hitShaderBindingTableBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) hitShaderBindingOffset; + VkDeviceSize DECLSPEC_ALIGN(8) hitShaderBindingStride; + VkBuffer DECLSPEC_ALIGN(8) callableShaderBindingTableBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) callableShaderBindingOffset; + VkDeviceSize DECLSPEC_ALIGN(8) callableShaderBindingStride; uint32_t width; uint32_t height; uint32_t depth; @@ -1901,9 +1899,9 @@ struct vkCmdTraceRaysNV_params struct vkCmdUpdateBuffer_params { VkCommandBuffer commandBuffer; - VkBuffer dstBuffer; - VkDeviceSize dstOffset; - VkDeviceSize dataSize; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) dstOffset; + VkDeviceSize DECLSPEC_ALIGN(8) dataSize; const void *pData; };
@@ -1944,7 +1942,7 @@ struct vkCmdWriteAccelerationStructuresPropertiesKHR_params uint32_t accelerationStructureCount; const VkAccelerationStructureKHR *pAccelerationStructures; VkQueryType queryType; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; };
@@ -1954,7 +1952,7 @@ struct vkCmdWriteAccelerationStructuresPropertiesNV_params uint32_t accelerationStructureCount; const VkAccelerationStructureNV *pAccelerationStructures; VkQueryType queryType; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; };
@@ -1962,8 +1960,8 @@ struct vkCmdWriteBufferMarker2AMD_params { VkCommandBuffer commandBuffer; VkPipelineStageFlags2 stage; - VkBuffer dstBuffer; - VkDeviceSize dstOffset; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) dstOffset; uint32_t marker; };
@@ -1971,8 +1969,8 @@ struct vkCmdWriteBufferMarkerAMD_params { VkCommandBuffer commandBuffer; VkPipelineStageFlagBits pipelineStage; - VkBuffer dstBuffer; - VkDeviceSize dstOffset; + VkBuffer DECLSPEC_ALIGN(8) dstBuffer; + VkDeviceSize DECLSPEC_ALIGN(8) dstOffset; uint32_t marker; };
@@ -1980,7 +1978,7 @@ struct vkCmdWriteTimestamp_params { VkCommandBuffer commandBuffer; VkPipelineStageFlagBits pipelineStage; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; };
@@ -1988,7 +1986,7 @@ struct vkCmdWriteTimestamp2_params { VkCommandBuffer commandBuffer; VkPipelineStageFlags2 stage; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; };
@@ -1996,35 +1994,35 @@ struct vkCmdWriteTimestamp2KHR_params { VkCommandBuffer commandBuffer; VkPipelineStageFlags2 stage; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t query; };
struct vkCompileDeferredNV_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; uint32_t shader; };
struct vkCopyAccelerationStructureKHR_params { VkDevice device; - VkDeferredOperationKHR deferredOperation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation; const VkCopyAccelerationStructureInfoKHR *pInfo; };
struct vkCopyAccelerationStructureToMemoryKHR_params { VkDevice device; - VkDeferredOperationKHR deferredOperation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation; const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo; };
struct vkCopyMemoryToAccelerationStructureKHR_params { VkDevice device; - VkDeferredOperationKHR deferredOperation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation; const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo; };
@@ -2072,7 +2070,7 @@ struct vkCreateCommandPool_params struct vkCreateComputePipelines_params { VkDevice device; - VkPipelineCache pipelineCache; + VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache; uint32_t createInfoCount; const VkComputePipelineCreateInfo *pCreateInfos; const VkAllocationCallbacks *pAllocator; @@ -2186,7 +2184,7 @@ struct vkCreateFramebuffer_params struct vkCreateGraphicsPipelines_params { VkDevice device; - VkPipelineCache pipelineCache; + VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache; uint32_t createInfoCount; const VkGraphicsPipelineCreateInfo *pCreateInfos; const VkAllocationCallbacks *pAllocator; @@ -2268,8 +2266,8 @@ struct vkCreateQueryPool_params struct vkCreateRayTracingPipelinesKHR_params { VkDevice device; - VkDeferredOperationKHR deferredOperation; - VkPipelineCache pipelineCache; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) deferredOperation; + VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache; uint32_t createInfoCount; const VkRayTracingPipelineCreateInfoKHR *pCreateInfos; const VkAllocationCallbacks *pAllocator; @@ -2279,7 +2277,7 @@ struct vkCreateRayTracingPipelinesKHR_params struct vkCreateRayTracingPipelinesNV_params { VkDevice device; - VkPipelineCache pipelineCache; + VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache; uint32_t createInfoCount; const VkRayTracingPipelineCreateInfoNV *pCreateInfos; const VkAllocationCallbacks *pAllocator; @@ -2391,7 +2389,7 @@ struct vkDebugReportMessageEXT_params VkInstance instance; VkDebugReportFlagsEXT flags; VkDebugReportObjectTypeEXT objectType; - uint64_t object; + uint64_t DECLSPEC_ALIGN(8) object; size_t location; int32_t messageCode; const char *pLayerPrefix; @@ -2401,104 +2399,104 @@ struct vkDebugReportMessageEXT_params struct vkDeferredOperationJoinKHR_params { VkDevice device; - VkDeferredOperationKHR operation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation; };
struct vkDestroyAccelerationStructureKHR_params { VkDevice device; - VkAccelerationStructureKHR accelerationStructure; + VkAccelerationStructureKHR DECLSPEC_ALIGN(8) accelerationStructure; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyAccelerationStructureNV_params { VkDevice device; - VkAccelerationStructureNV accelerationStructure; + VkAccelerationStructureNV DECLSPEC_ALIGN(8) accelerationStructure; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyBuffer_params { VkDevice device; - VkBuffer buffer; + VkBuffer DECLSPEC_ALIGN(8) buffer; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyBufferView_params { VkDevice device; - VkBufferView bufferView; + VkBufferView DECLSPEC_ALIGN(8) bufferView; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyCommandPool_params { VkDevice device; - VkCommandPool commandPool; + VkCommandPool DECLSPEC_ALIGN(8) commandPool; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyCuFunctionNVX_params { VkDevice device; - VkCuFunctionNVX function; + VkCuFunctionNVX DECLSPEC_ALIGN(8) function; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyCuModuleNVX_params { VkDevice device; - VkCuModuleNVX module; + VkCuModuleNVX DECLSPEC_ALIGN(8) module; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDebugReportCallbackEXT_params { VkInstance instance; - VkDebugReportCallbackEXT callback; + VkDebugReportCallbackEXT DECLSPEC_ALIGN(8) callback; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDebugUtilsMessengerEXT_params { VkInstance instance; - VkDebugUtilsMessengerEXT messenger; + VkDebugUtilsMessengerEXT DECLSPEC_ALIGN(8) messenger; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDeferredOperationKHR_params { VkDevice device; - VkDeferredOperationKHR operation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDescriptorPool_params { VkDevice device; - VkDescriptorPool descriptorPool; + VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDescriptorSetLayout_params { VkDevice device; - VkDescriptorSetLayout descriptorSetLayout; + VkDescriptorSetLayout DECLSPEC_ALIGN(8) descriptorSetLayout; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDescriptorUpdateTemplate_params { VkDevice device; - VkDescriptorUpdateTemplate descriptorUpdateTemplate; + VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyDescriptorUpdateTemplateKHR_params { VkDevice device; - VkDescriptorUpdateTemplate descriptorUpdateTemplate; + VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate; const VkAllocationCallbacks *pAllocator; };
@@ -2511,42 +2509,42 @@ struct vkDestroyDevice_params struct vkDestroyEvent_params { VkDevice device; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyFence_params { VkDevice device; - VkFence fence; + VkFence DECLSPEC_ALIGN(8) fence; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyFramebuffer_params { VkDevice device; - VkFramebuffer framebuffer; + VkFramebuffer DECLSPEC_ALIGN(8) framebuffer; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyImage_params { VkDevice device; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyImageView_params { VkDevice device; - VkImageView imageView; + VkImageView DECLSPEC_ALIGN(8) imageView; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyIndirectCommandsLayoutNV_params { VkDevice device; - VkIndirectCommandsLayoutNV indirectCommandsLayout; + VkIndirectCommandsLayoutNV DECLSPEC_ALIGN(8) indirectCommandsLayout; const VkAllocationCallbacks *pAllocator; };
@@ -2559,105 +2557,105 @@ struct vkDestroyInstance_params struct vkDestroyPipeline_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyPipelineCache_params { VkDevice device; - VkPipelineCache pipelineCache; + VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyPipelineLayout_params { VkDevice device; - VkPipelineLayout pipelineLayout; + VkPipelineLayout DECLSPEC_ALIGN(8) pipelineLayout; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyPrivateDataSlot_params { VkDevice device; - VkPrivateDataSlot privateDataSlot; + VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyPrivateDataSlotEXT_params { VkDevice device; - VkPrivateDataSlot privateDataSlot; + VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyQueryPool_params { VkDevice device; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyRenderPass_params { VkDevice device; - VkRenderPass renderPass; + VkRenderPass DECLSPEC_ALIGN(8) renderPass; const VkAllocationCallbacks *pAllocator; };
struct vkDestroySampler_params { VkDevice device; - VkSampler sampler; + VkSampler DECLSPEC_ALIGN(8) sampler; const VkAllocationCallbacks *pAllocator; };
struct vkDestroySamplerYcbcrConversion_params { VkDevice device; - VkSamplerYcbcrConversion ycbcrConversion; + VkSamplerYcbcrConversion DECLSPEC_ALIGN(8) ycbcrConversion; const VkAllocationCallbacks *pAllocator; };
struct vkDestroySamplerYcbcrConversionKHR_params { VkDevice device; - VkSamplerYcbcrConversion ycbcrConversion; + VkSamplerYcbcrConversion DECLSPEC_ALIGN(8) ycbcrConversion; const VkAllocationCallbacks *pAllocator; };
struct vkDestroySemaphore_params { VkDevice device; - VkSemaphore semaphore; + VkSemaphore DECLSPEC_ALIGN(8) semaphore; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyShaderModule_params { VkDevice device; - VkShaderModule shaderModule; + VkShaderModule DECLSPEC_ALIGN(8) shaderModule; const VkAllocationCallbacks *pAllocator; };
struct vkDestroySurfaceKHR_params { VkInstance instance; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; const VkAllocationCallbacks *pAllocator; };
struct vkDestroySwapchainKHR_params { VkDevice device; - VkSwapchainKHR swapchain; + VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain; const VkAllocationCallbacks *pAllocator; };
struct vkDestroyValidationCacheEXT_params { VkDevice device; - VkValidationCacheEXT validationCache; + VkValidationCacheEXT DECLSPEC_ALIGN(8) validationCache; const VkAllocationCallbacks *pAllocator; };
@@ -2738,7 +2736,7 @@ struct vkFlushMappedMemoryRanges_params struct vkFreeCommandBuffers_params { VkDevice device; - VkCommandPool commandPool; + VkCommandPool DECLSPEC_ALIGN(8) commandPool; uint32_t commandBufferCount; const VkCommandBuffer *pCommandBuffers; }; @@ -2746,7 +2744,7 @@ struct vkFreeCommandBuffers_params struct vkFreeDescriptorSets_params { VkDevice device; - VkDescriptorPool descriptorPool; + VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool; uint32_t descriptorSetCount; const VkDescriptorSet *pDescriptorSets; }; @@ -2754,7 +2752,7 @@ struct vkFreeDescriptorSets_params struct vkFreeMemory_params { VkDevice device; - VkDeviceMemory memory; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; const VkAllocationCallbacks *pAllocator; };
@@ -2777,7 +2775,7 @@ struct vkGetAccelerationStructureDeviceAddressKHR_params struct vkGetAccelerationStructureHandleNV_params { VkDevice device; - VkAccelerationStructureNV accelerationStructure; + VkAccelerationStructureNV DECLSPEC_ALIGN(8) accelerationStructure; size_t dataSize; void *pData; }; @@ -2813,7 +2811,7 @@ struct vkGetBufferDeviceAddressKHR_params struct vkGetBufferMemoryRequirements_params { VkDevice device; - VkBuffer buffer; + VkBuffer DECLSPEC_ALIGN(8) buffer; VkMemoryRequirements *pMemoryRequirements; };
@@ -2857,19 +2855,19 @@ struct vkGetCalibratedTimestampsEXT_params struct vkGetDeferredOperationMaxConcurrencyKHR_params { VkDevice device; - VkDeferredOperationKHR operation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation; };
struct vkGetDeferredOperationResultKHR_params { VkDevice device; - VkDeferredOperationKHR operation; + VkDeferredOperationKHR DECLSPEC_ALIGN(8) operation; };
struct vkGetDescriptorSetHostMappingVALVE_params { VkDevice device; - VkDescriptorSet descriptorSet; + VkDescriptorSet DECLSPEC_ALIGN(8) descriptorSet; void **ppData; };
@@ -2942,7 +2940,7 @@ struct vkGetDeviceGroupPresentCapabilitiesKHR_params struct vkGetDeviceGroupSurfacePresentModesKHR_params { VkDevice device; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; VkDeviceGroupPresentModeFlagsKHR *pModes; };
@@ -2979,7 +2977,7 @@ struct vkGetDeviceImageSparseMemoryRequirementsKHR_params struct vkGetDeviceMemoryCommitment_params { VkDevice device; - VkDeviceMemory memory; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; VkDeviceSize *pCommittedMemoryInBytes; };
@@ -3015,7 +3013,7 @@ struct vkGetDeviceQueue2_params struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params { VkDevice device; - VkRenderPass renderpass; + VkRenderPass DECLSPEC_ALIGN(8) renderpass; VkExtent2D *pMaxWorkgroupSize; };
@@ -3029,19 +3027,19 @@ struct vkGetDynamicRenderingTilePropertiesQCOM_params struct vkGetEventStatus_params { VkDevice device; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; };
struct vkGetFenceStatus_params { VkDevice device; - VkFence fence; + VkFence DECLSPEC_ALIGN(8) fence; };
struct vkGetFramebufferTilePropertiesQCOM_params { VkDevice device; - VkFramebuffer framebuffer; + VkFramebuffer DECLSPEC_ALIGN(8) framebuffer; uint32_t *pPropertiesCount; VkTilePropertiesQCOM *pProperties; }; @@ -3056,7 +3054,7 @@ struct vkGetGeneratedCommandsMemoryRequirementsNV_params struct vkGetImageMemoryRequirements_params { VkDevice device; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; VkMemoryRequirements *pMemoryRequirements; };
@@ -3077,7 +3075,7 @@ struct vkGetImageMemoryRequirements2KHR_params struct vkGetImageSparseMemoryRequirements_params { VkDevice device; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; uint32_t *pSparseMemoryRequirementCount; VkSparseImageMemoryRequirements *pSparseMemoryRequirements; }; @@ -3101,7 +3099,7 @@ struct vkGetImageSparseMemoryRequirements2KHR_params struct vkGetImageSubresourceLayout_params { VkDevice device; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; const VkImageSubresource *pSubresource; VkSubresourceLayout *pLayout; }; @@ -3109,7 +3107,7 @@ struct vkGetImageSubresourceLayout_params struct vkGetImageSubresourceLayout2EXT_params { VkDevice device; - VkImage image; + VkImage DECLSPEC_ALIGN(8) image; const VkImageSubresource2EXT *pSubresource; VkSubresourceLayout2EXT *pLayout; }; @@ -3117,7 +3115,7 @@ struct vkGetImageSubresourceLayout2EXT_params struct vkGetImageViewAddressNVX_params { VkDevice device; - VkImageView imageView; + VkImageView DECLSPEC_ALIGN(8) imageView; VkImageViewAddressPropertiesNVX *pProperties; };
@@ -3297,7 +3295,7 @@ struct vkGetPhysicalDeviceMultisamplePropertiesEXT_params struct vkGetPhysicalDevicePresentRectanglesKHR_params { VkPhysicalDevice physicalDevice; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; uint32_t *pRectCount; VkRect2D *pRects; }; @@ -3393,7 +3391,7 @@ struct vkGetPhysicalDeviceSurfaceCapabilities2KHR_params struct vkGetPhysicalDeviceSurfaceCapabilitiesKHR_params { VkPhysicalDevice physicalDevice; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; VkSurfaceCapabilitiesKHR *pSurfaceCapabilities; };
@@ -3408,7 +3406,7 @@ struct vkGetPhysicalDeviceSurfaceFormats2KHR_params struct vkGetPhysicalDeviceSurfaceFormatsKHR_params { VkPhysicalDevice physicalDevice; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; uint32_t *pSurfaceFormatCount; VkSurfaceFormatKHR *pSurfaceFormats; }; @@ -3416,7 +3414,7 @@ struct vkGetPhysicalDeviceSurfaceFormatsKHR_params struct vkGetPhysicalDeviceSurfacePresentModesKHR_params { VkPhysicalDevice physicalDevice; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; uint32_t *pPresentModeCount; VkPresentModeKHR *pPresentModes; }; @@ -3425,7 +3423,7 @@ struct vkGetPhysicalDeviceSurfaceSupportKHR_params { VkPhysicalDevice physicalDevice; uint32_t queueFamilyIndex; - VkSurfaceKHR surface; + VkSurfaceKHR DECLSPEC_ALIGN(8) surface; VkBool32 *pSupported; };
@@ -3452,7 +3450,7 @@ struct vkGetPhysicalDeviceWin32PresentationSupportKHR_params struct vkGetPipelineCacheData_params { VkDevice device; - VkPipelineCache pipelineCache; + VkPipelineCache DECLSPEC_ALIGN(8) pipelineCache; size_t *pDataSize; void *pData; }; @@ -3492,8 +3490,8 @@ struct vkGetPrivateData_params { VkDevice device; VkObjectType objectType; - uint64_t objectHandle; - VkPrivateDataSlot privateDataSlot; + uint64_t DECLSPEC_ALIGN(8) objectHandle; + VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot; uint64_t *pData; };
@@ -3501,20 +3499,20 @@ struct vkGetPrivateDataEXT_params { VkDevice device; VkObjectType objectType; - uint64_t objectHandle; - VkPrivateDataSlot privateDataSlot; + uint64_t DECLSPEC_ALIGN(8) objectHandle; + VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot; uint64_t *pData; };
struct vkGetQueryPoolResults_params { VkDevice device; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; uint32_t queryCount; size_t dataSize; void *pData; - VkDeviceSize stride; + VkDeviceSize DECLSPEC_ALIGN(8) stride; VkQueryResultFlags flags; };
@@ -3535,7 +3533,7 @@ struct vkGetQueueCheckpointDataNV_params struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; uint32_t firstGroup; uint32_t groupCount; size_t dataSize; @@ -3545,7 +3543,7 @@ struct vkGetRayTracingCaptureReplayShaderGroupHandlesKHR_params struct vkGetRayTracingShaderGroupHandlesKHR_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; uint32_t firstGroup; uint32_t groupCount; size_t dataSize; @@ -3555,7 +3553,7 @@ struct vkGetRayTracingShaderGroupHandlesKHR_params struct vkGetRayTracingShaderGroupHandlesNV_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; uint32_t firstGroup; uint32_t groupCount; size_t dataSize; @@ -3565,7 +3563,7 @@ struct vkGetRayTracingShaderGroupHandlesNV_params struct vkGetRayTracingShaderGroupStackSizeKHR_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; uint32_t group; VkShaderGroupShaderKHR groupShader; }; @@ -3573,28 +3571,28 @@ struct vkGetRayTracingShaderGroupStackSizeKHR_params struct vkGetRenderAreaGranularity_params { VkDevice device; - VkRenderPass renderPass; + VkRenderPass DECLSPEC_ALIGN(8) renderPass; VkExtent2D *pGranularity; };
struct vkGetSemaphoreCounterValue_params { VkDevice device; - VkSemaphore semaphore; + VkSemaphore DECLSPEC_ALIGN(8) semaphore; uint64_t *pValue; };
struct vkGetSemaphoreCounterValueKHR_params { VkDevice device; - VkSemaphore semaphore; + VkSemaphore DECLSPEC_ALIGN(8) semaphore; uint64_t *pValue; };
struct vkGetShaderInfoAMD_params { VkDevice device; - VkPipeline pipeline; + VkPipeline DECLSPEC_ALIGN(8) pipeline; VkShaderStageFlagBits shaderStage; VkShaderInfoTypeAMD infoType; size_t *pInfoSize; @@ -3611,14 +3609,14 @@ struct vkGetShaderModuleCreateInfoIdentifierEXT_params struct vkGetShaderModuleIdentifierEXT_params { VkDevice device; - VkShaderModule shaderModule; + VkShaderModule DECLSPEC_ALIGN(8) shaderModule; VkShaderModuleIdentifierEXT *pIdentifier; };
struct vkGetSwapchainImagesKHR_params { VkDevice device; - VkSwapchainKHR swapchain; + VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain; uint32_t *pSwapchainImageCount; VkImage *pSwapchainImages; }; @@ -3626,7 +3624,7 @@ struct vkGetSwapchainImagesKHR_params struct vkGetValidationCacheDataEXT_params { VkDevice device; - VkValidationCacheEXT validationCache; + VkValidationCacheEXT DECLSPEC_ALIGN(8) validationCache; size_t *pDataSize; void *pData; }; @@ -3647,9 +3645,9 @@ struct vkInvalidateMappedMemoryRanges_params struct vkMapMemory_params { VkDevice device; - VkDeviceMemory memory; - VkDeviceSize offset; - VkDeviceSize size; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; + VkDeviceSize DECLSPEC_ALIGN(8) offset; + VkDeviceSize DECLSPEC_ALIGN(8) size; VkMemoryMapFlags flags; void **ppData; }; @@ -3657,7 +3655,7 @@ struct vkMapMemory_params struct vkMergePipelineCaches_params { VkDevice device; - VkPipelineCache dstCache; + VkPipelineCache DECLSPEC_ALIGN(8) dstCache; uint32_t srcCacheCount; const VkPipelineCache *pSrcCaches; }; @@ -3665,7 +3663,7 @@ struct vkMergePipelineCaches_params struct vkMergeValidationCachesEXT_params { VkDevice device; - VkValidationCacheEXT dstCache; + VkValidationCacheEXT DECLSPEC_ALIGN(8) dstCache; uint32_t srcCacheCount; const VkValidationCacheEXT *pSrcCaches; }; @@ -3681,7 +3679,7 @@ struct vkQueueBindSparse_params VkQueue queue; uint32_t bindInfoCount; const VkBindSparseInfo *pBindInfo; - VkFence fence; + VkFence DECLSPEC_ALIGN(8) fence; };
struct vkQueueEndDebugUtilsLabelEXT_params @@ -3704,7 +3702,7 @@ struct vkQueuePresentKHR_params struct vkQueueSetPerformanceConfigurationINTEL_params { VkQueue queue; - VkPerformanceConfigurationINTEL configuration; + VkPerformanceConfigurationINTEL DECLSPEC_ALIGN(8) configuration; };
struct vkQueueSubmit_params @@ -3712,7 +3710,7 @@ struct vkQueueSubmit_params VkQueue queue; uint32_t submitCount; const VkSubmitInfo *pSubmits; - VkFence fence; + VkFence DECLSPEC_ALIGN(8) fence; };
struct vkQueueSubmit2_params @@ -3720,7 +3718,7 @@ struct vkQueueSubmit2_params VkQueue queue; uint32_t submitCount; const VkSubmitInfo2 *pSubmits; - VkFence fence; + VkFence DECLSPEC_ALIGN(8) fence; };
struct vkQueueSubmit2KHR_params @@ -3728,7 +3726,7 @@ struct vkQueueSubmit2KHR_params VkQueue queue; uint32_t submitCount; const VkSubmitInfo2 *pSubmits; - VkFence fence; + VkFence DECLSPEC_ALIGN(8) fence; };
struct vkQueueWaitIdle_params @@ -3739,7 +3737,7 @@ struct vkQueueWaitIdle_params struct vkReleasePerformanceConfigurationINTEL_params { VkDevice device; - VkPerformanceConfigurationINTEL configuration; + VkPerformanceConfigurationINTEL DECLSPEC_ALIGN(8) configuration; };
struct vkReleaseProfilingLockKHR_params @@ -3756,21 +3754,21 @@ struct vkResetCommandBuffer_params struct vkResetCommandPool_params { VkDevice device; - VkCommandPool commandPool; + VkCommandPool DECLSPEC_ALIGN(8) commandPool; VkCommandPoolResetFlags flags; };
struct vkResetDescriptorPool_params { VkDevice device; - VkDescriptorPool descriptorPool; + VkDescriptorPool DECLSPEC_ALIGN(8) descriptorPool; VkDescriptorPoolResetFlags flags; };
struct vkResetEvent_params { VkDevice device; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; };
struct vkResetFences_params @@ -3783,7 +3781,7 @@ struct vkResetFences_params struct vkResetQueryPool_params { VkDevice device; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; uint32_t queryCount; }; @@ -3791,7 +3789,7 @@ struct vkResetQueryPool_params struct vkResetQueryPoolEXT_params { VkDevice device; - VkQueryPool queryPool; + VkQueryPool DECLSPEC_ALIGN(8) queryPool; uint32_t firstQuery; uint32_t queryCount; }; @@ -3811,32 +3809,32 @@ struct vkSetDebugUtilsObjectTagEXT_params struct vkSetDeviceMemoryPriorityEXT_params { VkDevice device; - VkDeviceMemory memory; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; float priority; };
struct vkSetEvent_params { VkDevice device; - VkEvent event; + VkEvent DECLSPEC_ALIGN(8) event; };
struct vkSetPrivateData_params { VkDevice device; VkObjectType objectType; - uint64_t objectHandle; - VkPrivateDataSlot privateDataSlot; - uint64_t data; + uint64_t DECLSPEC_ALIGN(8) objectHandle; + VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot; + uint64_t DECLSPEC_ALIGN(8) data; };
struct vkSetPrivateDataEXT_params { VkDevice device; VkObjectType objectType; - uint64_t objectHandle; - VkPrivateDataSlot privateDataSlot; - uint64_t data; + uint64_t DECLSPEC_ALIGN(8) objectHandle; + VkPrivateDataSlot DECLSPEC_ALIGN(8) privateDataSlot; + uint64_t DECLSPEC_ALIGN(8) data; };
struct vkSignalSemaphore_params @@ -3862,14 +3860,14 @@ struct vkSubmitDebugUtilsMessageEXT_params struct vkTrimCommandPool_params { VkDevice device; - VkCommandPool commandPool; + VkCommandPool DECLSPEC_ALIGN(8) commandPool; VkCommandPoolTrimFlags flags; };
struct vkTrimCommandPoolKHR_params { VkDevice device; - VkCommandPool commandPool; + VkCommandPool DECLSPEC_ALIGN(8) commandPool; VkCommandPoolTrimFlags flags; };
@@ -3881,22 +3879,22 @@ struct vkUninitializePerformanceApiINTEL_params struct vkUnmapMemory_params { VkDevice device; - VkDeviceMemory memory; + VkDeviceMemory DECLSPEC_ALIGN(8) memory; };
struct vkUpdateDescriptorSetWithTemplate_params { VkDevice device; - VkDescriptorSet descriptorSet; - VkDescriptorUpdateTemplate descriptorUpdateTemplate; + VkDescriptorSet DECLSPEC_ALIGN(8) descriptorSet; + VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate; const void *pData; };
struct vkUpdateDescriptorSetWithTemplateKHR_params { VkDevice device; - VkDescriptorSet descriptorSet; - VkDescriptorUpdateTemplate descriptorUpdateTemplate; + VkDescriptorSet DECLSPEC_ALIGN(8) descriptorSet; + VkDescriptorUpdateTemplate DECLSPEC_ALIGN(8) descriptorUpdateTemplate; const void *pData; };
@@ -3915,29 +3913,29 @@ struct vkWaitForFences_params uint32_t fenceCount; const VkFence *pFences; VkBool32 waitAll; - uint64_t timeout; + uint64_t DECLSPEC_ALIGN(8) timeout; };
struct vkWaitForPresentKHR_params { VkDevice device; - VkSwapchainKHR swapchain; - uint64_t presentId; - uint64_t timeout; + VkSwapchainKHR DECLSPEC_ALIGN(8) swapchain; + uint64_t DECLSPEC_ALIGN(8) presentId; + uint64_t DECLSPEC_ALIGN(8) timeout; };
struct vkWaitSemaphores_params { VkDevice device; const VkSemaphoreWaitInfo *pWaitInfo; - uint64_t timeout; + uint64_t DECLSPEC_ALIGN(8) timeout; };
struct vkWaitSemaphoresKHR_params { VkDevice device; const VkSemaphoreWaitInfo *pWaitInfo; - uint64_t timeout; + uint64_t DECLSPEC_ALIGN(8) timeout; };
struct vkWriteAccelerationStructuresPropertiesKHR_params @@ -3951,6 +3949,4 @@ struct vkWriteAccelerationStructuresPropertiesKHR_params size_t stride; };
-#include "poppack.h" - #endif /* __WINE_VULKAN_LOADER_THUNKS_H */ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 99bad6b4c57..cb6fd08373b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1675,6 +1675,9 @@ class VkParam(VkVariable):
proto += self.type
+ if is_member and self.needs_alignment(): + proto += " DECLSPEC_ALIGN(8)" + if self.is_pointer(): proto += " {0}{1}".format(self.pointer, self.name) elif is_member and self.is_static_array(): @@ -3045,8 +3048,6 @@ class VkGenerator(object): f.write(" unix_count,\n") f.write("};\n\n")
- f.write("#include "pshpack4.h"\n\n") - for vk_func in self.registry.funcs.values(): if not vk_func.needs_exposing(): continue @@ -3063,7 +3064,6 @@ class VkGenerator(object): f.write(" {0} result;\n".format(vk_func.type)) f.write("};\n\n");
- f.write("#include "poppack.h"\n\n") f.write("#endif /* __WINE_VULKAN_LOADER_THUNKS_H */\n")
def generate_vulkan_h(self, f):
-
Jacek Caban -
Jacek Caban (＠jacek)