[PATCH 0/2] MR6478: winevulkan: Handle multidimensional static arrays.
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7d0795f1f06..ca171ed9d4e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -347,6 +347,23 @@ def convert_suffix(direction, win_type, unwrap, is_wrapped): return "{0}_to_host".format(win_type) +# Arrays come in multiple formats. Known formats are: +# +# <member><type>uint32_t</type> <name>foo</name>[<enum>VK_FOO_SIZE</enum>]</member> +# <member><type>uint32_t</type> <name>foo</name>[4]</member> +def parse_array_len(element): + name_elem = element.find("name") + if name_elem.tail: + name_tail = name_elem.tail.strip() + if name_tail and name_tail != "" and name_tail[0] == "[": + enum_elem = element.find("enum") + if enum_elem is not None: + return enum_elem.text + else: + return name_tail.strip("[]") + return None + + class VkBaseType(object): def __init__(self, name, _type, alias=None, requires=None): """ Vulkan base type class. @@ -1474,7 +1491,6 @@ class VkMember(VkVariable): struct_fwd_decl = False member_type = None pointer = None - array_len = None bit_width = None values = member.get("values") @@ -1511,17 +1527,7 @@ class VkMember(VkVariable): if dyn_array_len is None and pointer is not None: dyn_array_len = 1 - # Some members are arrays, attempt to parse these. Formats include: - # <member><type>char</type><name>extensionName</name>[<enum>VK_MAX_EXTENSION_NAME_SIZE</enum>]</member> - # <member><type>uint32_t</type><name>foo</name>[4]</member> - if name_tail and name_tail[0] == '[': - LOGGER.debug("Found array type") - enum_elem = member.find("enum") - if enum_elem is not None: - array_len = enum_elem.text - else: - # Remove brackets around length - array_len = name_tail.strip("[]") + array_len = parse_array_len(member) object_type = member.get("objecttype", None) @@ -1722,11 +1728,9 @@ class VkParam(VkVariable): # <param>const <type>char</type>* <name>pLayerName</name></param> name_elem = param.find("name") - array_len = None name = name_elem.text - # Tail contains array length e.g. for blendConstants param of vkSetBlendConstants - if name_elem.tail is not None: - array_len = name_elem.tail.strip("[]") + # E.g. vkCmdSetBlendConstants(). + array_len = parse_array_len(param) # Name of other parameter in function prototype, which stores the number of # elements pointed to be by this parameter. -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6478
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 83 ++++++++++++++++++++----------------- include/wine/vulkan.h | 34 +++++++-------- 2 files changed, 61 insertions(+), 56 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ca171ed9d4e..2b98893e0c1 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -349,20 +349,20 @@ def convert_suffix(direction, win_type, unwrap, is_wrapped): # Arrays come in multiple formats. Known formats are: # -# <member><type>uint32_t</type> <name>foo</name>[<enum>VK_FOO_SIZE</enum>]</member> -# <member><type>uint32_t</type> <name>foo</name>[4]</member> -def parse_array_len(element): - name_elem = element.find("name") - if name_elem.tail: - name_tail = name_elem.tail.strip() - if name_tail and name_tail != "" and name_tail[0] == "[": - enum_elem = element.find("enum") - if enum_elem is not None: - return enum_elem.text - else: - return name_tail.strip("[]") - return None - +# <member><type>uint32_t</type> <name>foo</name>[<enum>VK_FOO_SIZE</enum>][<enum>VK_FOO_COUNT</enum>]</member> +# <member><type>uint32_t</type> <name>foo</name>[3][4]</member> +def parse_array_lens(element): + text = '' + + for e in element: + if e.tag == 'name': + if e.tail: + text += e.tail + elif e.tag == 'enum': + text += e.text + e.tail + elif e.tag != 'comment' and e.tag != 'type': + LOGGER.warning("Ignoring tag <{0}> while trying to parse array sizes".format(e.tag)) + return [i.strip('[]') for i in re.findall(r'\[\w+\]', text)] class VkBaseType(object): def __init__(self, name, _type, alias=None, requires=None): @@ -784,8 +784,8 @@ class VkFunction(object): if param.is_pointer(): pfn += " " + param.pointer - if param.array_len is not None: - pfn += "[{0}]".format(param.array_len) + for l in param.array_lens: + pfn += "[{0}]".format(l) if i < len(self.params) - 1: pfn += ", " @@ -1228,7 +1228,7 @@ class VkHandle(object): class VkVariable(object): - def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, + def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_lens=[], dyn_array_len=None, object_type=None, optional=False, returnedonly=False, parent=None, selection=None, selector=None): self.const = const @@ -1243,7 +1243,7 @@ class VkVariable(object): self.selector = selector self.pointer = pointer - self.array_len = array_len + self.array_lens = array_lens self.dyn_array_len = dyn_array_len self.pointer_array = False if isinstance(dyn_array_len, str): @@ -1335,14 +1335,14 @@ class VkVariable(object): Vulkan uses this for dynamically sized arrays for which there is a 'count' parameter. """ - return self.dyn_array_len is not None and self.array_len is None + return self.dyn_array_len is not None and len(self.array_lens) == 0 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 + return len(self.array_lens) > 0 def is_generic_handle(self): """ Returns True if the member is a unit64_t containing @@ -1463,10 +1463,10 @@ class VkVariable(object): class VkMember(VkVariable): - def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_lens=[], dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None, returnedonly=False, parent=None, selection=None, selector=None): - VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_len=array_len, + VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_lens=array_lens, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional, returnedonly=returnedonly, parent=parent, selection=selection, selector=selector) self.struct_fwd_decl = struct_fwd_decl @@ -1475,7 +1475,7 @@ class VkMember(VkVariable): def __repr__(self): return "{0} {1} {2} {3} {4} {5} {6}".format(self.const, self.struct_fwd_decl, self.type, self.pointer, - self.name, self.array_len, self.dyn_array_len) + self.name, self.array_lens, self.dyn_array_len) @staticmethod def from_xml(member, returnedonly, parent): @@ -1527,7 +1527,7 @@ class VkMember(VkVariable): if dyn_array_len is None and pointer is not None: dyn_array_len = 1 - array_len = parse_array_len(member) + array_lens = parse_array_lens(member) object_type = member.get("objecttype", None) @@ -1541,7 +1541,7 @@ class VkMember(VkVariable): selector = member.get("selector", None) return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, - name=name_elem.text, array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, + name=name_elem.text, array_lens=array_lens, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type, bit_width=bit_width, returnedonly=returnedonly, parent=parent, selection=selection, selector=selector) @@ -1564,8 +1564,10 @@ class VkMember(VkVariable): return "{0}{1} = convert_{2}_{6}array_{5}(ctx, {3}, {4});\n".format(output, self.name, self.type, self.value(input, conv), count, suffix, pointer_part) elif self.is_static_array(): - count = self.array_len - if direction == Direction.OUTPUT: + count = self.array_lens[0] + if len(self.array_lens) > 1: + LOGGER.warn("TODO: implement conversion of multidimensional static array for {0}.{1}".format(self.type, self.name)) + elif direction == Direction.OUTPUT: # Needed by VkMemoryHeap.memoryHeaps return "convert_{0}_array_{5}({2}{1}, {3}{1}, {4});\n".format(self.type, self.name, input, output, count, suffix) @@ -1598,7 +1600,9 @@ class VkMember(VkVariable): return "convert_{0}_{4}({5}&{2}{1}, &{3}{1}{6});\n".format(self.type, self.name, input, output, suffix, ctx_param, selector_part) elif self.is_static_array(): - bytes_count = "{0} * sizeof({1})".format(self.array_len, self.type) + bytes_count = "sizeof({0})".format(self.type) + for l in self.array_lens: + bytes_count = "{0} * ".format(l) + bytes_count return "memcpy({0}{1}, {2}{1}, {3});\n".format(output, self.name, input, bytes_count) elif conv and direction == Direction.OUTPUT and self.is_pointer(): return "{0}{1} = PtrToUlong({2}{1});\n".format(output, self.name, input) @@ -1619,8 +1623,8 @@ class VkMember(VkVariable): if conv and (self.is_pointer() or self.is_pointer_size()): text = "PTR32 " + self.name - if self.is_static_array(): - text += "[{0}]".format(self.array_len) + for l in self.array_lens: + text += "[{0}]".format(l) return text text = "" @@ -1645,8 +1649,8 @@ class VkMember(VkVariable): else: text += " " + self.name - if self.is_static_array(): - text += "[{0}]".format(self.array_len) + for l in self.array_lens: + text += "[{0}]".format(l) if self.is_bit_field(): text += ":{}".format(self.bit_width) @@ -1703,16 +1707,16 @@ class VkMember(VkVariable): class VkParam(VkVariable): """ Helper class which describes a parameter to a function call. """ - def __init__(self, type_info, const=None, pointer=None, name=None, parent=None, array_len=None, + def __init__(self, type_info, const=None, pointer=None, name=None, parent=None, array_lens=None, dyn_array_len=None, object_type=None, optional=False): 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, + pointer=pointer, array_lens=array_lens, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional, parent=parent) self._set_format_string() def __repr__(self): - return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_len, self.dyn_array_len) + return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_lens, self.dyn_array_len) @staticmethod def from_xml(param, types, parent): @@ -1730,7 +1734,7 @@ class VkParam(VkVariable): name_elem = param.find("name") name = name_elem.text # E.g. vkCmdSetBlendConstants(). - array_len = parse_array_len(param) + array_lens = parse_array_lens(param) # Name of other parameter in function prototype, which stores the number of # elements pointed to be by this parameter. @@ -1752,7 +1756,7 @@ class VkParam(VkVariable): if type_info is None: LOGGER.err("type info not found for: {0}".format(type_elem.text)) - return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, + return VkParam(type_info, const=const, pointer=pointer, name=name, array_lens=array_lens, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional, parent=parent) @@ -1872,8 +1876,9 @@ class VkParam(VkVariable): if postfix is not None: proto += postfix - if not is_member and self.is_static_array(): - proto += "[{0}]".format(self.array_len) + if not is_member: + for l in self.array_lens: + proto += "[{0}]".format(l) return proto diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 0842407e39b..d07d780a7dc 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -6171,7 +6171,7 @@ typedef struct StdVideoAV1FilmGrainFlags typedef struct StdVideoAV1GlobalMotion { uint8_t GmType[STD_VIDEO_AV1_NUM_REF_FRAMES]; - int32_t gm_params[STD_VIDEO_AV1_NUM_REF_FRAMES]; + int32_t gm_params[STD_VIDEO_AV1_NUM_REF_FRAMES][STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS]; } StdVideoAV1GlobalMotion; typedef struct StdVideoAV1LoopFilterFlags @@ -6197,7 +6197,7 @@ typedef struct StdVideoAV1QuantizationFlags typedef struct StdVideoAV1Segmentation { uint8_t FeatureEnabled[STD_VIDEO_AV1_MAX_SEGMENTS]; - int16_t FeatureData[STD_VIDEO_AV1_MAX_SEGMENTS]; + int16_t FeatureData[STD_VIDEO_AV1_MAX_SEGMENTS][STD_VIDEO_AV1_SEG_LVL_MAX]; } StdVideoAV1Segmentation; typedef struct StdVideoAV1SequenceHeaderFlags @@ -6458,8 +6458,8 @@ typedef struct StdVideoH264ScalingLists { uint16_t scaling_list_present_mask; uint16_t use_default_scaling_matrix_mask; - uint8_t ScalingList4x4[STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS]; - uint8_t ScalingList8x8[STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS]; + uint8_t ScalingList4x4[STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS][STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS]; + uint8_t ScalingList8x8[STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS][STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS]; } StdVideoH264ScalingLists; typedef struct StdVideoH264SpsFlags @@ -6559,7 +6559,7 @@ typedef struct StdVideoH265PpsFlags typedef struct StdVideoH265PredictorPaletteEntries { - uint16_t PredictorPaletteEntries[STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE]; + uint16_t PredictorPaletteEntries[STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE][STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE]; } StdVideoH265PredictorPaletteEntries; typedef struct StdVideoH265ProfileTierLevelFlags @@ -6573,10 +6573,10 @@ typedef struct StdVideoH265ProfileTierLevelFlags typedef struct StdVideoH265ScalingLists { - uint8_t ScalingList4x4[STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS]; - uint8_t ScalingList8x8[STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS]; - uint8_t ScalingList16x16[STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS]; - uint8_t ScalingList32x32[STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS]; + uint8_t ScalingList4x4[STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS]; + uint8_t ScalingList8x8[STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS]; + uint8_t ScalingList16x16[STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS]; + uint8_t ScalingList32x32[STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS]; uint8_t ScalingListDCCoef16x16[STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS]; uint8_t ScalingListDCCoef32x32[STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS]; } StdVideoH265ScalingLists; @@ -14238,12 +14238,12 @@ typedef struct StdVideoEncodeH264WeightTable uint8_t chroma_log2_weight_denom; int8_t luma_weight_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF]; int8_t luma_offset_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF]; - int8_t chroma_weight_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF]; - int8_t chroma_offset_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF]; + int8_t chroma_weight_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES]; + int8_t chroma_offset_l0[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES]; int8_t luma_weight_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF]; int8_t luma_offset_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF]; - int8_t chroma_weight_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF]; - int8_t chroma_offset_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF]; + int8_t chroma_weight_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES]; + int8_t chroma_offset_l1[STD_VIDEO_H264_MAX_NUM_LIST_REF][STD_VIDEO_H264_MAX_CHROMA_PLANES]; } StdVideoEncodeH264WeightTable; typedef struct StdVideoEncodeH265ReferenceInfo @@ -14272,12 +14272,12 @@ typedef struct StdVideoEncodeH265WeightTable int8_t delta_chroma_log2_weight_denom; int8_t delta_luma_weight_l0[STD_VIDEO_H265_MAX_NUM_LIST_REF]; int8_t luma_offset_l0[STD_VIDEO_H265_MAX_NUM_LIST_REF]; - int8_t delta_chroma_weight_l0[STD_VIDEO_H265_MAX_NUM_LIST_REF]; - int8_t delta_chroma_offset_l0[STD_VIDEO_H265_MAX_NUM_LIST_REF]; + int8_t delta_chroma_weight_l0[STD_VIDEO_H265_MAX_NUM_LIST_REF][STD_VIDEO_H265_MAX_CHROMA_PLANES]; + int8_t delta_chroma_offset_l0[STD_VIDEO_H265_MAX_NUM_LIST_REF][STD_VIDEO_H265_MAX_CHROMA_PLANES]; int8_t delta_luma_weight_l1[STD_VIDEO_H265_MAX_NUM_LIST_REF]; int8_t luma_offset_l1[STD_VIDEO_H265_MAX_NUM_LIST_REF]; - int8_t delta_chroma_weight_l1[STD_VIDEO_H265_MAX_NUM_LIST_REF]; - int8_t delta_chroma_offset_l1[STD_VIDEO_H265_MAX_NUM_LIST_REF]; + int8_t delta_chroma_weight_l1[STD_VIDEO_H265_MAX_NUM_LIST_REF][STD_VIDEO_H265_MAX_CHROMA_PLANES]; + int8_t delta_chroma_offset_l1[STD_VIDEO_H265_MAX_NUM_LIST_REF][STD_VIDEO_H265_MAX_CHROMA_PLANES]; } StdVideoEncodeH265WeightTable; typedef struct StdVideoH264PictureParameterSet -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6478
participants (2)
-
Elizabeth Figura -
Elizabeth Figura (＠zfigura)