OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/genxml: Emit struct details before pack function

Browse Source 
We are going to use packed structs in [un]pack next so we need those to
be emitted before them.

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32962>
This commit is contained in:
Mary Guillemard
2025-01-08 12:40:57 +01:00
committed by Marge Bot
parent 95435a788d
commit 39d8b56c4a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/panfrost/lib/genxml/gen_pack.py
View File

@@ -636,13 +636,8 @@ class Parser(object):
print('#define {}_SECTION_{}_OFFSET {}'.format(aggregate.name.upper(), section.name.upper(), section.offset)) print('#define {}_SECTION_{}_OFFSET {}'.format(aggregate.name.upper(), section.name.upper(), section.offset))
print("") print("")
def emit_pack_function(self, name, group): def emit_struct_detail(self, name, group):
print("static ALWAYS_INLINE void\n%s_pack(uint32_t * restrict cl,\n%sconst struct %s * restrict values)\n{" % group.get_length()
(name, ' ' * (len(name) + 6), name))
group.emit_pack_function()
print("}\n\n")
# Should be a whole number of words # Should be a whole number of words
assert((self.group.length % 4) == 0) assert((self.group.length % 4) == 0)
@@ -652,6 +647,14 @@ class Parser(object):
print('#define {} {}'.format (name + "_ALIGN", self.group.align)) print('#define {} {}'.format (name + "_ALIGN", self.group.align))
print('struct {}_packed {{ uint32_t opaque[{}]; }};'.format(name.lower(), self.group.length // 4)) print('struct {}_packed {{ uint32_t opaque[{}]; }};'.format(name.lower(), self.group.length // 4))
def emit_pack_function(self, name, group):
print("static ALWAYS_INLINE void\n%s_pack(uint32_t * restrict cl,\n%sconst struct %s * restrict values)\n{" %
(name, ' ' * (len(name) + 6), name))
group.emit_pack_function()
print("}\n\n")
def emit_unpack_function(self, name, group): def emit_unpack_function(self, name, group):
print("static inline void") print("static inline void")
print("%s_unpack(const uint32_t * restrict cl,\n%sstruct %s * restrict values)\n{" % print("%s_unpack(const uint32_t * restrict cl,\n%sstruct %s * restrict values)\n{" %
@@ -675,6 +678,7 @@ class Parser(object):
self.emit_template_struct(self.struct, self.group) self.emit_template_struct(self.struct, self.group)
self.emit_header(name) self.emit_header(name)
if self.no_direct_packing == False: if self.no_direct_packing == False:
self.emit_struct_detail(self.struct, self.group)
self.emit_pack_function(self.struct, self.group) self.emit_pack_function(self.struct, self.group)
self.emit_unpack_function(self.struct, self.group) self.emit_unpack_function(self.struct, self.group)
self.emit_print_function(self.struct, self.group) self.emit_print_function(self.struct, self.group)