53 files changed, 7 insertions, 6 deletions
diff --git a/tests/all.tests b/tests/all.tests
index f40408329..949219493 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -759,11 +759,12 @@ arb_shader_texture_lod = Group()
 spec['ARB_shader_texture_lod'] = arb_shader_texture_lod
 import_glsl_parser_tests(arb_shader_texture_lod,
 			 os.path.join(os.path.dirname(__file__), 'spec', 'arb_shader_texture_lod'),
-			 [''])
-add_plain_test(arb_shader_texture_lod, 'arb_shader_texture_lod-texgrad')
-arb_shader_texture_lod['tex-miplevel-selection-texture2DLod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-nolod', '-GL_ARB_shader_texture_lod'])
-arb_shader_texture_lod['tex-miplevel-selection-texture2DLod-lod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-GL_ARB_shader_texture_lod'])
-arb_shader_texture_lod['tex-miplevel-selection-texture2DLod-lod-bias'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-GL_ARB_shader_texture_lod'])
+			 ['compiler'])
+arb_shader_texture_lod['execution'] = Group()
+add_plain_test(arb_shader_texture_lod['execution'], 'arb_shader_texture_lod-texgrad')
+arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-nolod', '-GL_ARB_shader_texture_lod'])
+arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod-lod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-GL_ARB_shader_texture_lod'])
+arb_shader_texture_lod['execution']['tex-miplevel-selection-texture2DLod-lod-bias'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-GL_ARB_shader_texture_lod'])
 
 # Group ARB_explicit_attrib_location
 arb_explicit_attrib_location = Group()
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 3b574878d..529862e2d 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory (arb_robustness)
 add_subdirectory (arb_sampler_objects)
 add_subdirectory (arb_seamless_cube_map)
 add_subdirectory (amd_seamless_cubemap_per_texture)
-add_subdirectory (arb_shader_texture_lod)
+add_subdirectory (arb_shader_texture_lod/execution)
 add_subdirectory (ati_draw_buffers)
 add_subdirectory (arb_texture_float)
 add_subdirectory (ati_envmap_bumpmap)
diff --git a/tests/spec/arb_shader_texture_lod/make_tex_lod_tests.sh b/tests/spec/arb_shader_texture_lod/compiler/make_tex_lod_tests.sh
index 405e79bda..405e79bda 100755
--- a/tests/spec/arb_shader_texture_lod/make_tex_lod_tests.sh
+++ b/tests/spec/arb_shader_texture_lod/compiler/make_tex_lod_tests.sh
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-01.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-01.frag
index ee16e1d17..ee16e1d17 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-01.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-01.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-02.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-02.frag
index ca13caf9c..ca13caf9c 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-02.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-02.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-03.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-03.frag
index 3ee120d71..3ee120d71 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-03.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-03.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-04.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-04.frag
index 217f47c8f..217f47c8f 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-04.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-04.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-05.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-05.frag
index fc3e02d58..fc3e02d58 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-05.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-05.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-06.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-06.frag
index 943b43c2e..943b43c2e 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-06.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-06.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-07.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-07.frag
index cc5622ee5..cc5622ee5 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-07.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-07.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-08.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-08.frag
index 199c29b9e..199c29b9e 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-08.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-08.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-09.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-09.frag
index 012986dc6..012986dc6 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-09.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-09.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-10.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-10.frag
index f74a73644..f74a73644 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-10.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-10.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-11.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-11.frag
index 6a692aa22..6a692aa22 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-11.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-11.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-12.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-12.frag
index 8faf8072d..8faf8072d 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-12.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-12.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-13.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-13.frag
index 5731472dd..5731472dd 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-13.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-13.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-14.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-14.frag
index b3be41487..b3be41487 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-14.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-14.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-15.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-15.frag
index 6a0896930..6a0896930 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-15.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-15.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-16.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-16.frag
index 0f41615da..0f41615da 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-16.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-16.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-17.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-17.frag
index a435ca7d4..a435ca7d4 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-17.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-17.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-18.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-18.vert
index ee4578956..ee4578956 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-18.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-18.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-19.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-19.vert
index b1a6d59f5..b1a6d59f5 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-19.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-19.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-20.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-20.vert
index 2888551ed..2888551ed 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-20.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-20.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-21.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-21.vert
index aa38bd78b..aa38bd78b 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-21.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-21.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-22.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-22.vert
index d42751423..d42751423 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-22.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-22.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-23.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-23.vert
index a1be4262d..a1be4262d 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-23.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-23.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-24.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-24.vert
index 7ffb2207e..7ffb2207e 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-24.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-24.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-25.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-25.vert
index 80eb60bf5..80eb60bf5 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-25.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-25.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-26.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-26.vert
index 9d4ff65a0..9d4ff65a0 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-26.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-26.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-27.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-27.vert
index e0d9ed84f..e0d9ed84f 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-27.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-27.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-28.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-28.vert
index bddf89c92..bddf89c92 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-28.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-28.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-29.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-29.vert
index 00a96939b..00a96939b 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-29.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-29.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-30.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-30.vert
index bd34a0676..bd34a0676 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-30.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-30.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-31.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-31.vert
index 8433f982f..8433f982f 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-31.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-31.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-32.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-32.vert
index 819d59535..819d59535 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-32.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-32.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-33.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-33.vert
index 595f4fbf1..595f4fbf1 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-33.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-33.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_grad-34.vert b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-34.vert
index 38d40b5cd..38d40b5cd 100644
--- a/tests/spec/arb_shader_texture_lod/tex_grad-34.vert
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_grad-34.vert
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-01.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-01.frag
index 88ffa16a8..88ffa16a8 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-01.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-01.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-02.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-02.frag
index b5f0b5cf2..b5f0b5cf2 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-02.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-02.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-03.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-03.frag
index 8246e59a4..8246e59a4 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-03.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-03.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-04.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-04.frag
index 7210ae2a2..7210ae2a2 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-04.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-04.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-05.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-05.frag
index ddb243710..ddb243710 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-05.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-05.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-06.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-06.frag
index 8a540e529..8a540e529 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-06.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-06.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-07.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-07.frag
index cf2c52e38..cf2c52e38 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-07.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-07.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-08.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-08.frag
index e47015dc9..e47015dc9 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-08.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-08.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-09.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-09.frag
index ccd91d0fb..ccd91d0fb 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-09.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-09.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-10.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-10.frag
index 5e809fa21..5e809fa21 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-10.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-10.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-11.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-11.frag
index 3d507e8e4..3d507e8e4 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-11.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-11.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-12.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-12.frag
index 65aca6168..65aca6168 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-12.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-12.frag
diff --git a/tests/spec/arb_shader_texture_lod/tex_lod-13.frag b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-13.frag
index e4b00e615..e4b00e615 100644
--- a/tests/spec/arb_shader_texture_lod/tex_lod-13.frag
+++ b/tests/spec/arb_shader_texture_lod/compiler/tex_lod-13.frag
diff --git a/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
index 163d96492..163d96492 100644
--- a/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
diff --git a/tests/spec/arb_shader_texture_lod/CMakeLists.txt b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.txt
index 144a306f4..144a306f4 100644
--- a/tests/spec/arb_shader_texture_lod/CMakeLists.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.txt
diff --git a/tests/spec/arb_shader_texture_lod/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
index a7bf6ecdb..a7bf6ecdb 100644
--- a/tests/spec/arb_shader_texture_lod/texgrad.c
+++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c