AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Split the pack/unpack functions out of the format desc.

Browse Source 
This gives the compiler a chance to GC pack/unpack functions separate from
the format descriptions.  For drivers that use everything, this is
+10-20kb, while for libvulkan_intel it's -1.3MB.

Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=1048434
Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5826>
This commit is contained in:
Eric Anholt
2020-07-01 13:19:47 -07:00
parent 6723addd8a
commit 4064a6cd20
10 changed files with 285 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/format/u_format_table.py
+46 -26
View File
@@ -124,6 +124,25 @@ def write_format_table(formats):
print(" %s%s\t/* %s */" % (swizzle_map[swizzle], sep, comment))
print(" },")
def generate_table_getter(type):
print("const struct util_format_%sdescription *" % type)
print("util_format_%sdescription(enum pipe_format format)" % type)
print("{")
print(" if (format >= PIPE_FORMAT_COUNT) {")
print(" return NULL;")
print(" }")
print()
print(" switch (format) {")
for format in formats:
print(" case %s:" % format.name)
print(" return &util_format_%s_%sdescription;" % (format.short_name(), type))
print(" default:")
print(" return NULL;")
print(" }")
print("}")
print()
for format in formats:
sn = format.short_name()
@@ -143,6 +162,8 @@ def write_format_table(formats):
u_format_pack.print_channels(format, do_channel_array)
u_format_pack.print_channels(format, do_swizzle_array)
print(" %s," % (colorspace_map(format.colorspace),))
print("};")
print()
# We don't generate code for YUV formats, and many of the new ones lack pack/unpack
# functions for softpipe/llvmpipe.
@@ -174,55 +195,54 @@ def write_format_table(formats):
access = False
if format.layout == 'etc' and sn != 'etc1_rgb8':
access = False
print('const struct util_format_pack_description')
print('util_format_%s_pack_description = {' % sn)
if format.colorspace != ZS and not format.is_pure_color() and access:
print(" .pack_rgba_8unorm = &util_format_%s_pack_rgba_8unorm," % sn)
print(" .pack_rgba_float = &util_format_%s_pack_rgba_float," % sn)
if format.has_depth():
print(" .pack_z_32unorm = &util_format_%s_pack_z_32unorm," % sn)
print(" .pack_z_float = &util_format_%s_pack_z_float," % sn)
if format.has_stencil():
print(" .pack_s_8uint = &util_format_%s_pack_s_8uint," % sn)
if format.is_pure_unsigned() or format.is_pure_signed():
print(" .pack_rgba_uint = &util_format_%s_pack_unsigned," % sn)
print(" .pack_rgba_sint = &util_format_%s_pack_signed," % sn)
print("};")
print()
print('const struct util_format_unpack_description')
print('util_format_%s_unpack_description = {' % sn)
if format.colorspace != ZS and not format.is_pure_color() and access:
print(" .unpack_rgba_8unorm = &util_format_%s_unpack_rgba_8unorm," % sn)
print(" .pack_rgba_8unorm = &util_format_%s_pack_rgba_8unorm," % sn)
if format.layout == 's3tc' or format.layout == 'rgtc':
print(" .fetch_rgba_8unorm = &util_format_%s_fetch_rgba_8unorm," % sn)
print(" .unpack_rgba = &util_format_%s_unpack_rgba_float," % sn)
print(" .pack_rgba_float = &util_format_%s_pack_rgba_float," % sn)
print(" .fetch_rgba_float = &util_format_%s_fetch_rgba_float," % sn)
if format.has_depth():
print(" .unpack_z_32unorm = &util_format_%s_unpack_z_32unorm," % sn)
print(" .pack_z_32unorm = &util_format_%s_pack_z_32unorm," % sn)
print(" .unpack_z_float = &util_format_%s_unpack_z_float," % sn)
print(" .pack_z_float = &util_format_%s_pack_z_float," % sn)
if format.has_stencil():
print(" .unpack_s_8uint = &util_format_%s_unpack_s_8uint," % sn)
print(" .pack_s_8uint = &util_format_%s_pack_s_8uint," % sn)
if format.is_pure_unsigned():
print(" .unpack_rgba = &util_format_%s_unpack_unsigned," % sn)
print(" .pack_rgba_uint = &util_format_%s_pack_unsigned," % sn)
print(" .pack_rgba_sint = &util_format_%s_pack_signed," % sn)
print(" .fetch_rgba_uint = &util_format_%s_fetch_unsigned," % sn)
elif format.is_pure_signed():
print(" .pack_rgba_uint = &util_format_%s_pack_unsigned," % sn)
print(" .unpack_rgba = &util_format_%s_unpack_signed," % sn)
print(" .pack_rgba_sint = &util_format_%s_pack_signed," % sn)
print(" .fetch_rgba_sint = &util_format_%s_fetch_signed," % sn)
print("};")
print()
print("const struct util_format_description *")
print("util_format_description(enum pipe_format format)")
print("{")
print(" if (format >= PIPE_FORMAT_COUNT) {")
print(" return NULL;")
print(" }")
print()
print(" switch (format) {")
for format in formats:
print(" case %s:" % format.name)
print(" return &util_format_%s_description;" % (format.short_name(),))
print(" default:")
print(" return NULL;")
print(" }")
print("}")
print()
generate_table_getter("")
generate_table_getter("pack_")
generate_table_getter("unpack_")
def main():