X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Futil%2Fformat%2Fu_format_table.py;h=bb89d56a42db10ce48156e43bb544a8009763b55;hp=b517788932d562e1c7f13bd87f0fe0d0c88609d3;hb=4064a6cd207811434e5400a613b3833fbda6b787;hpb=2da4badfe346d948fef5ed749a611eb599eb9d9f diff --git a/src/util/format/u_format_table.py b/src/util/format/u_format_table.py index b517788932d..bb89d56a42d 100644 --- a/src/util/format/u_format_table.py +++ b/src/util/format/u_format_table.py @@ -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,60 +162,87 @@ 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),)) - access = True + print("};") + print() + + # We don't generate code for YUV formats, and many of the new ones lack pack/unpack + # functions for softpipe/llvmpipe. + noaccess_formats = [ + 'yv12', + 'yv16', + 'iyuv', + 'nv12', + 'nv16', + 'nv21', + 'p010', + 'p012', + 'p016', + 'xyuv', + 'ayuv', + 'r8g8_r8b8_unorm', + 'g8r8_b8r8_unorm', + 'g8r8_g8b8_unorm', + 'y8_u8_v8_422_unorm', + 'y8_u8v8_422_unorm', + 'y8_u8_v8_444_unorm', + 'y16_u16_v16_420_unorm', + 'y16_u16_v16_422_unorm', + 'y16_u16v16_422_unorm', + 'y16_u16_v16_444_unorm', + ] + access = sn not in noaccess_formats if format.layout in ('astc', 'atc', 'fxt1'): 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(" .unpack_rgba_8unorm = &util_format_%s_unpack_rgba_8unorm," % sn) 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) if format.layout == 's3tc' or format.layout == 'rgtc': print(" .fetch_rgba_8unorm = &util_format_%s_fetch_rgba_8unorm," % sn) - print(" .unpack_rgba_float = &util_format_%s_unpack_rgba_float," % sn) - print(" .pack_rgba_float = &util_format_%s_pack_rgba_float," % sn) + print(" .unpack_rgba = &util_format_%s_unpack_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_uint = &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(" .unpack_rgba = &util_format_%s_unpack_unsigned," % 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_sint = &util_format_%s_unpack_signed," % sn) - print(" .pack_rgba_sint = &util_format_%s_pack_signed," % sn) + print(" .unpack_rgba = &util_format_%s_unpack_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():