From 9f986778bd4393c5a9108426969d45aa7f10f334 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 19 Oct 2011 10:44:43 +0200 Subject: libX11 libXext libXft mesa libxcb mkfontscale pixman xserver xkeyboard-config git update 19 oct 2011 --- mesalib/src/gallium/auxiliary/util/u_format_table.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mesalib/src/gallium/auxiliary/util/u_format_table.py') diff --git a/mesalib/src/gallium/auxiliary/util/u_format_table.py b/mesalib/src/gallium/auxiliary/util/u_format_table.py index 6c00b0df3..250a53598 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format_table.py +++ b/mesalib/src/gallium/auxiliary/util/u_format_table.py @@ -159,17 +159,17 @@ def write_format_table(formats): print " NULL, /* unpack_z_float */" print " NULL, /* pack_z_float */" if format.colorspace == ZS and format.swizzles[1] != SWIZZLE_NONE: - print " &util_format_%s_unpack_s_8uscaled," % format.short_name() - print " &util_format_%s_pack_s_8uscaled," % format.short_name() + print " &util_format_%s_unpack_s_8uint," % format.short_name() + print " &util_format_%s_pack_s_8uint," % format.short_name() else: - print " NULL, /* unpack_s_8uscaled */" - print " NULL, /* pack_s_8uscaled */" - if format.channels[0].pure == True and format.channels[0].type == UNSIGNED: + print " NULL, /* unpack_s_8uint */" + print " NULL, /* pack_s_8uint */" + if format.colorspace != ZS and format.channels[0].pure == True and format.channels[0].type == UNSIGNED: print " &util_format_%s_unpack_unsigned, /* unpack_rgba_uint */" % format.short_name() print " &util_format_%s_pack_unsigned, /* pack_rgba_uint */" % format.short_name() print " &util_format_%s_unpack_signed, /* unpack_rgba_sint */" % format.short_name() print " &util_format_%s_pack_signed /* pack_rgba_sint */" % format.short_name() - elif format.channels[0].pure == True and format.channels[0].type == SIGNED: + elif format.colorspace != ZS and format.channels[0].pure == True and format.channels[0].type == SIGNED: print " &util_format_%s_unpack_unsigned, /* unpack_rgba_uint */" % format.short_name() print " &util_format_%s_pack_unsigned, /* pack_rgba_uint */" % format.short_name() print " &util_format_%s_unpack_signed, /* unpack_rgba_sint */" % format.short_name() -- cgit v1.2.3