[Piglit] [PATCH 4/4] textureSize: Add GLSL 1.40 textureSize() to all.tests.

[Eric Anholt]

The samplerBuffer tests are currently SKIPs until the test code is added.
---
 tests/all.tests |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 21934d7..6a9d16d 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -936,9 +936,11 @@ import_glsl_parser_tests(spec['glsl-1.30'],
 spec['glsl-1.30']['execution'] = Group()
 spec['glsl-1.30']['execution']['textureSize'] = Group()
 spec['glsl-1.30']['execution']['texelFetch'] = Group()
+
+textureSize_samplers_130 = ['sampler1D', 'sampler2D', 'sampler3D', 'samplerCube', 'sampler1DShadow', 'sampler2DShadow', 'samplerCubeShadow', 'sampler1DArray', 'sampler2DArray', 'sampler1DArrayShadow', 'sampler2DArrayShadow', 'isampler1D', 'isampler2D', 'isampler3D', 'isamplerCube', 'isampler1DArray', 'isampler2DArray', 'usampler1D', 'usampler2D', 'usampler3D', 'usamplerCube', 'usampler1DArray', 'usampler2DArray']
 for stage in ['vs', 'fs']:
 	# textureSize():
-	for sampler in ['sampler1D', 'sampler2D', 'sampler3D', 'samplerCube', 'sampler1DShadow', 'sampler2DShadow', 'samplerCubeShadow', 'sampler1DArray', 'sampler2DArray', 'sampler1DArrayShadow', 'sampler2DArrayShadow', 'isampler1D', 'isampler2D', 'isampler3D', 'isamplerCube', 'isampler1DArray', 'isampler2DArray', 'usampler1D', 'usampler2D', 'usampler3D', 'usamplerCube', 'usampler1DArray', 'usampler2DArray']:
+	for sampler in textureSize_samplers_130:
 		spec['glsl-1.30']['execution']['textureSize'][stage + '-textureSize-' + sampler] = PlainExecTest(['textureSize', stage, sampler, '-auto', '-fbo'])
 	# texelFetch():
 	for sampler in ['sampler1D', 'sampler2D', 'sampler3D', 'sampler1DArray', 'sampler2DArray', 'isampler1D', 'isampler2D', 'isampler3D', 'isampler1DArray', 'isampler2DArray', 'usampler1D', 'usampler2D', 'usampler3D', 'usampler1DArray', 'usampler2DArray']:
@@ -980,6 +982,13 @@ import_glsl_parser_tests(spec['glsl-1.40'],
 add_shader_test_dir(spec['glsl-1.40'],
 	            os.path.join(testsDir, 'spec', 'glsl-1.40'),
 		    recursive=True)
+spec['glsl-1.40']['execution']['textureSize'] = Group()
+
+textureSize_samplers_140 = textureSize_samplers_130 + ['sampler2DRect', 'isampler2DRect', 'sampler2DRectShadow', 'samplerBuffer', 'isamplerBuffer', 'usamplerBuffer']
+for stage in ['vs', 'fs']:
+	# textureSize():
+	for sampler in textureSize_samplers_140:
+		spec['glsl-1.40']['execution']['textureSize'][stage + '-textureSize-' + sampler] = PlainExecTest(['textureSize', '140', stage, sampler, '-auto', '-fbo'])
 
 # Group AMD_conservative_depth
 spec['AMD_conservative_depth'] = Group()
-- 
1.7.9.1