Module: Mesa Branch: master Commit: 3153bcc73ef857f9bb294d2eea6964ed35e884bb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3153bcc73ef857f9bb294d2eea6964ed35e884bb
Author: Mathieu Bridon <[email protected]> Date: Thu Jul 5 12:43:04 2018 +0200 gallium/auxiliary: Fix string matching Commit f69bc797e15fe6beb9e439009fab55f7fae0b7f9 did the following: - if format.layout in ('bptc', 'astc'): + if format.layout in ('astc'): The intention was to go from matching either 'bptc' or 'astc' to matching only 'astc'. But the new code doesn't respect this intention any more, because in Python `('astc')` is not a tuple containing a string, it is just the string. (the parentheses are simply ignored) That means we now match any substring of 'astc', for example 'a'. This commit fixes the test to respect the original intention. Fixes: f69bc797e15fe6beb9e4 "gallium/auxiliary: Add helper support for bptc format compress/decompress" Reviewed-by: Eric Engestrom <[email protected]> --- src/gallium/auxiliary/util/u_format_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/util/u_format_table.py b/src/gallium/auxiliary/util/u_format_table.py index 1f8e15fa97..a9df984994 100644 --- a/src/gallium/auxiliary/util/u_format_table.py +++ b/src/gallium/auxiliary/util/u_format_table.py @@ -139,7 +139,7 @@ def write_format_table(formats): u_format_pack.print_channels(format, do_swizzle_array) print " %s," % (colorspace_map(format.colorspace),) access = True - if format.layout in ('astc'): + if format.layout == 'astc': access = False if format.layout == 'etc' and format.short_name() != 'etc1_rgb8': access = False _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
