Because gs is a 1.50 features, but is added in the 1.30 and 1.40 loops it currently adds the same tests twice. This corrects that.
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com> --- tests/all.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/all.py b/tests/all.py index 46bb9c1..f63207a 100755 --- a/tests/all.py +++ b/tests/all.py @@ -1360,12 +1360,17 @@ for stage in ['vs', 'gs', 'fs']: version = '1.50' else: version = '1.30' + # textureSize(): - for sampler in textureSize_samplers_130: - profile.test_list[grouptools.join( - 'spec', 'glsl-{}'.format(version), 'execution', 'textureSize', - '{}-textureSize-{}'.format(stage, sampler))] = PiglitGLTest( - ['textureSize', stage, sampler]) + # These will be added in the textureSize_samplers_140 loop for gs, because + # it is a special case and is actually 1.50 feature. + if stage is not 'gs': + for sampler in textureSize_samplers_130: + profile.test_list[grouptools.join( + 'spec', 'glsl-{}'.format(version), 'execution', 'textureSize', + '{}-textureSize-{}'.format(stage, sampler))] = PiglitGLTest( + ['textureSize', stage, sampler]) + # texelFetch(): for sampler in ['sampler1D', 'sampler2D', 'sampler3D', 'sampler1DArray', 'sampler2DArray', 'isampler1D', 'isampler2D', 'isampler3D', @@ -1380,6 +1385,7 @@ for stage in ['vs', 'gs', 'fs']: 'spec', 'glsl-{}'.format(version), 'execution', 'texelFetchOffset', '{}-texelFetch-{}'.format(stage, sampler))] = PiglitGLTest( ['texelFetch', 'offset', stage, sampler]) + # texelFetch() with EXT_texture_swizzle mode "b0r1": for type in ['i', 'u', '']: profile.test_list[grouptools.join( -- 2.3.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit