[Piglit] [PATCH 1/7] shader_runner: rename "texture shadow" to "texture shadow2D"
Marek Olšák
maraeo at gmail.com
Mon Sep 5 14:49:01 PDT 2011
---
tests/shaders/glsl-fs-shadow2d-01.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-02.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-03.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-04.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-05.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-06.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-07.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-08.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-09.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d-bias.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2d.shader_test | 2 +-
.../shaders/glsl-fs-shadow2dproj-bias.shader_test | 2 +-
tests/shaders/glsl-fs-shadow2dproj.shader_test | 2 +-
tests/shaders/shader_runner.c | 2 +-
.../glsl-fs-shadow2DGradARB-01.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-02.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-03.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-04.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-05.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-06.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-07.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-08.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-09.shader_test | 2 +-
.../glsl-fs-shadow2DGradARB-cumulative.shader_test | 2 +-
.../execution/fs-shadow2d-red-01.shader_test | 2 +-
.../execution/fs-shadow2d-red-02.shader_test | 2 +-
.../execution/fs-shadow2d-red-03.shader_test | 2 +-
.../fs-texture-sampler2dshadow-01.shader_test | 2 +-
.../fs-texture-sampler2dshadow-02.shader_test | 2 +-
.../fs-texture-sampler2dshadow-03.shader_test | 2 +-
.../fs-texture-sampler2dshadow-04.shader_test | 2 +-
.../fs-texture-sampler2dshadow-05.shader_test | 2 +-
.../fs-texture-sampler2dshadow-06.shader_test | 2 +-
.../fs-texture-sampler2dshadow-07.shader_test | 2 +-
.../fs-texture-sampler2dshadow-08.shader_test | 2 +-
.../fs-texture-sampler2dshadow-09.shader_test | 2 +-
.../fs-texture-sampler2dshadow-10.shader_test | 2 +-
.../fs-texture-sampler2dshadow-11.shader_test | 2 +-
.../fs-texture-sampler2dshadow-12.shader_test | 2 +-
39 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/tests/shaders/glsl-fs-shadow2d-01.shader_test b/tests/shaders/glsl-fs-shadow2d-01.shader_test
index 0eb96dd..f676e5d 100644
--- a/tests/shaders/glsl-fs-shadow2d-01.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-01.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-02.shader_test b/tests/shaders/glsl-fs-shadow2d-02.shader_test
index 778dda6..74bdd5f 100644
--- a/tests/shaders/glsl-fs-shadow2d-02.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-02.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-03.shader_test b/tests/shaders/glsl-fs-shadow2d-03.shader_test
index ca21e5c..e43fa2a 100644
--- a/tests/shaders/glsl-fs-shadow2d-03.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-03.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-04.shader_test b/tests/shaders/glsl-fs-shadow2d-04.shader_test
index 76b2c58..bebfa36 100644
--- a/tests/shaders/glsl-fs-shadow2d-04.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-04.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-05.shader_test b/tests/shaders/glsl-fs-shadow2d-05.shader_test
index 3707b14..d8e1736 100644
--- a/tests/shaders/glsl-fs-shadow2d-05.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-05.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-06.shader_test b/tests/shaders/glsl-fs-shadow2d-06.shader_test
index 200ffe2..d22c19d 100644
--- a/tests/shaders/glsl-fs-shadow2d-06.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-06.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-07.shader_test b/tests/shaders/glsl-fs-shadow2d-07.shader_test
index 06f9642..c75e354 100644
--- a/tests/shaders/glsl-fs-shadow2d-07.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-07.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-08.shader_test b/tests/shaders/glsl-fs-shadow2d-08.shader_test
index 88ca0c4..4918cc5 100644
--- a/tests/shaders/glsl-fs-shadow2d-08.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-08.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-09.shader_test b/tests/shaders/glsl-fs-shadow2d-09.shader_test
index 03a850f..d1c36c7 100644
--- a/tests/shaders/glsl-fs-shadow2d-09.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-09.shader_test
@@ -14,7 +14,7 @@ glsl-fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/shaders/glsl-fs-shadow2d-bias.shader_test b/tests/shaders/glsl-fs-shadow2d-bias.shader_test
index 2632be1..e29fd58 100644
--- a/tests/shaders/glsl-fs-shadow2d-bias.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d-bias.shader_test
@@ -21,7 +21,7 @@ void main()
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
draw rect -1 -1 2 2
relative probe rgba (0.0, 0.1) (1.0, 1.0, 1.0, 1.0)
relative probe rgba (0.0, 1.0) (1.0, 1.0, 1.0, 1.0)
diff --git a/tests/shaders/glsl-fs-shadow2d.shader_test b/tests/shaders/glsl-fs-shadow2d.shader_test
index 15d5602..1706021 100644
--- a/tests/shaders/glsl-fs-shadow2d.shader_test
+++ b/tests/shaders/glsl-fs-shadow2d.shader_test
@@ -21,7 +21,7 @@ void main()
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
draw rect -1 -1 2 2
relative probe rgba (0.0, 0.1) (1.0, 1.0, 1.0, 1.0)
relative probe rgba (0.0, 1.0) (1.0, 1.0, 1.0, 1.0)
diff --git a/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test b/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test
index ff7b46b..170cb94 100644
--- a/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test
+++ b/tests/shaders/glsl-fs-shadow2dproj-bias.shader_test
@@ -21,7 +21,7 @@ void main()
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
draw rect -1 -1 2 2
relative probe rgba (0.0, 0.1) (1.0, 1.0, 1.0, 1.0)
relative probe rgba (0.0, 1.0) (1.0, 1.0, 1.0, 1.0)
diff --git a/tests/shaders/glsl-fs-shadow2dproj.shader_test b/tests/shaders/glsl-fs-shadow2dproj.shader_test
index e855a9d..c84f372 100644
--- a/tests/shaders/glsl-fs-shadow2dproj.shader_test
+++ b/tests/shaders/glsl-fs-shadow2dproj.shader_test
@@ -21,7 +21,7 @@ void main()
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
draw rect -1 -1 2 2
relative probe rgba (0.0, 0.1) (1.0, 1.0, 1.0, 1.0)
relative probe rgba (0.0, 1.0) (1.0, 1.0, 1.0, 1.0)
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 07d7d87..ee3f439 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -1008,7 +1008,7 @@ piglit_display(void)
c + 0, c + 4);
glEnable(GL_TEXTURE_2D);
} else if (sscanf(line,
- "texture shadow %d ( %d , %d )",
+ "texture shadow2D %d ( %d , %d )",
&tex, &w, &h) == 3) {
glActiveTexture(GL_TEXTURE0 + tex);
piglit_depth_texture(GL_DEPTH_COMPONENT,
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test
index 4bde4a2..cf0a720 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-01.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test
index f9a04a2..10dcbcb 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-02.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test
index 681f2fb..27669b1 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-03.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test
index 32245ec..39b719d 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-04.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test
index 649cf01..e1a1837 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-05.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test
index 5a49d36..d2fd5f4 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-06.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test
index 89f3cd7..8f50c44 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-07.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test
index e77c007..49adcff 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-08.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test
index 0ef3141..bf85d29 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-09.shader_test
@@ -15,7 +15,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test
index e8ddb7c..8eb0b0f 100644
--- a/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test
+++ b/tests/spec/arb_shader_texture_lod/execution/glsl-fs-shadow2DGradARB-cumulative.shader_test
@@ -18,7 +18,7 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
###
### glsl-fs-shadow2DGradARB-01.shader_test
diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test
index 4124634..d434a0a 100644
--- a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test
+++ b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-01.shader_test
@@ -22,7 +22,7 @@ fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode red
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test
index e80a834..f38d45d 100644
--- a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test
+++ b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-02.shader_test
@@ -22,7 +22,7 @@ fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode red
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test
index 3734413..4c939b4 100644
--- a/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test
+++ b/tests/spec/arb_texture_rg/execution/fs-shadow2d-red-03.shader_test
@@ -22,7 +22,7 @@ fs-shadow2d.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode red
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test
index 8cab7dd..1bbdaad 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-01.shader_test
@@ -15,7 +15,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode red
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test
index b443bf1..c5b6cae 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-02.shader_test
@@ -15,7 +15,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode red
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test
index 97af27c..f072206 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-03.shader_test
@@ -15,7 +15,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode red
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test
index 700d30e..4f10faf 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-04.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test
index 0423a3e..b49cbd9 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-05.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test
index 5a30f39..4a23d3f 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-06.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode luminance
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test
index 1c21206..474dad7 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-07.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test
index 64ec75b..7a0037e 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-08.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test
index 8c455bb..dbe862a 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-09.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode intensity
texparameter compare_func never
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test
index 8ad19c6..e8df8eb 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-10.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func greater
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test
index 1c06a46..7598fa2 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-11.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func always
draw rect -1 -1 2 2
diff --git a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test
index 6318a40..96ad092 100644
--- a/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test
+++ b/tests/spec/glsl-1.30/execution/fs-texture-sampler2dshadow-12.shader_test
@@ -14,7 +14,7 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
-texture shadow 0 (32, 32)
+texture shadow2D 0 (32, 32)
texparameter depth_mode alpha
texparameter compare_func never
draw rect -1 -1 2 2
--
1.7.4.1
More information about the Piglit
mailing list