[Piglit] [PATCH 3/3] tests/all.py: Make MSAA_SAMPLE_COUNTS a list instead of a tuple

Ilia Mirkin imirkin at alum.mit.edu
Wed Dec 2 15:13:48 PST 2015


On Wed, Dec 2, 2015 at 5:36 PM,  <baker.dylan.c at gmail.com> wrote:
> From: Dylan Baker <baker.dylan.c at gmail.com>
>
> The problem with using MSAA_SAMPLE_COUNTS as a tuple is that it isn't a
> tuple. It's a sequence of like values, and is combined with other
> sequences of values, this is what a list is for.

Huh? List = mutable, tuple = immutable. This seems immutable, so it
should be a tuple. What am I missing?

>
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  tests/all.py | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/all.py b/tests/all.py
> index 9f1d0e9..50cc2b7 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -251,7 +251,7 @@ for dirpath, _, filenames in os.walk(_basedir):
>              ['asmparsertest', type_, os.path.join(dirpath, filename)])
>
>  # List of all of the MSAA sample counts we wish to test
> -MSAA_SAMPLE_COUNTS = ('2', '4', '6', '8', '16', '32')
> +MSAA_SAMPLE_COUNTS = ['2', '4', '6', '8', '16', '32']
>
>  with profile.group_manager(GleanTest, 'glean') as g:
>      g('basic')
> @@ -980,7 +980,7 @@ with profile.group_manager(
>      for format in color_formats:
>          g(['teximage-colors', format], run_concurrent=False)
>
> -    for num_samples in ('0',) + MSAA_SAMPLE_COUNTS:
> +    for num_samples in ['0'] + MSAA_SAMPLE_COUNTS:
>          add_fbo_depthstencil_tests(
>              grouptools.join('spec', '!opengl 1.1'), 'default_fb', num_samples)
>
> @@ -2209,7 +2209,7 @@ with profile.group_manager(
>          grouptools.join('spec', 'ARB_sample_shading')) as g:
>      g(['arb_sample_shading-api'], run_concurrent=False)
>
> -    for num_samples in ('0',) + MSAA_SAMPLE_COUNTS:
> +    for num_samples in ['0'] + MSAA_SAMPLE_COUNTS:
>          g(['arb_sample_shading-builtin-gl-num-samples', num_samples],
>            'builtin-gl-num-samples {0}'.format(num_samples),
>            run_concurrent=False)
> @@ -2230,7 +2230,7 @@ with profile.group_manager(
>            'ignore-centroid-qualifier {}'.format(sample_count),
>            run_concurrent=False)
>
> -    for num_samples in ('0',) + MSAA_SAMPLE_COUNTS:
> +    for num_samples in ['0',] + MSAA_SAMPLE_COUNTS:
>          g(['arb_sample_shading-builtin-gl-sample-mask-simple',
>             num_samples],
>            'builtin-gl-sample-mask-simple {}'.format(num_samples))
> @@ -2793,7 +2793,7 @@ with profile.group_manager(
>             sample_count],
>            'alpha-blending-after-rendering {}'.format(sample_count))
>
> -    for num_samples in ('all_samples',) + MSAA_SAMPLE_COUNTS:
> +    for num_samples in ['all_samples'] + MSAA_SAMPLE_COUNTS:
>          g(['ext_framebuffer_multisample-formats', num_samples],
>            'formats {}'.format(num_samples))
>
> @@ -2810,7 +2810,7 @@ with profile.group_manager(
>      # Note: the interpolation tests also check for sensible behaviour with
>      # non-multisampled framebuffers, so go ahead and test them with
>      # num_samples==0 as well.
> -    for num_samples in ('0',) + MSAA_SAMPLE_COUNTS:
> +    for num_samples in ['0'] + MSAA_SAMPLE_COUNTS:
>          g(['ext_framebuffer_multisample-blit-multiple-render-targets',
>             num_samples],
>            'blit-multiple-render-targets {}'.format(num_samples))
> --
> 2.6.2
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit


More information about the Piglit mailing list