[Piglit] [PATCH 3/7] shader_runner: rename "texparameter" to "texparameter2D"
Marek Olšák
maraeo at gmail.com
Mon Sep 5 14:49:03 PDT 2011
I'll need variants for other targets too.
---
tests/shaders/shader_runner.c | 48 ++++++++++----------
.../glsl-fs-shadow2DGradARB-01.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-02.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-03.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-04.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-05.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-06.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-07.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-08.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-09.shader_test | 4 +-
.../glsl-fs-shadow2DGradARB-cumulative.shader_test | 36 +++++++-------
.../execution/fs-shadow2d-red-01.shader_test | 4 +-
.../execution/fs-shadow2d-red-02.shader_test | 4 +-
.../execution/fs-shadow2d-red-03.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-01.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-02.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-03.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-04.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-05.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-06.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-07.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-08.shader_test | 4 +-
.../samplers/glsl-fs-shadow2D-09.shader_test | 4 +-
.../fs-texture-sampler2dshadow-01.shader_test | 4 +-
.../fs-texture-sampler2dshadow-02.shader_test | 4 +-
.../fs-texture-sampler2dshadow-03.shader_test | 4 +-
.../fs-texture-sampler2dshadow-04.shader_test | 4 +-
.../fs-texture-sampler2dshadow-05.shader_test | 4 +-
.../fs-texture-sampler2dshadow-06.shader_test | 4 +-
.../fs-texture-sampler2dshadow-07.shader_test | 4 +-
.../fs-texture-sampler2dshadow-08.shader_test | 4 +-
.../fs-texture-sampler2dshadow-09.shader_test | 4 +-
.../fs-texture-sampler2dshadow-10.shader_test | 4 +-
.../fs-texture-sampler2dshadow-11.shader_test | 4 +-
.../fs-texture-sampler2dshadow-12.shader_test | 4 +-
35 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index ee3f439..a52e042 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -1025,75 +1025,75 @@ piglit_display(void)
glEnable(GL_TEXTURE_2D);
} else if (!strncmp(line,
- "texparameter compare_func greater\n",
- 34)) {
+ "texparameter2D compare_func greater\n",
+ 36)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_GREATER);
} else if (!strncmp(line,
- "texparameter compare_func gequal\n",
- 33)) {
+ "texparameter2D compare_func gequal\n",
+ 35)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_GEQUAL);
} else if (!strncmp(line,
- "texparameter compare_func less\n",
- 31)) {
+ "texparameter2D compare_func less\n",
+ 33)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_LESS);
} else if (!strncmp(line,
- "texparameter compare_func lequal\n",
- 33)) {
+ "texparameter2D compare_func lequal\n",
+ 35)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_LEQUAL);
} else if (!strncmp(line,
- "texparameter compare_func equal\n",
- 32)) {
+ "texparameter2D compare_func equal\n",
+ 34)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_EQUAL);
} else if (!strncmp(line,
- "texparameter compare_func notequal\n",
- 35)) {
+ "texparameter2D compare_func notequal\n",
+ 37)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_NOTEQUAL);
} else if (!strncmp(line,
- "texparameter compare_func always\n",
- 33)) {
+ "texparameter2D compare_func always\n",
+ 35)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_ALWAYS);
} else if (!strncmp(line,
- "texparameter compare_func never\n",
- 32)) {
+ "texparameter2D compare_func never\n",
+ 34)) {
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC_ARB,
GL_NEVER);
} else if (!strncmp(line,
- "texparameter depth_mode red\n",
- 28)) {
+ "texparameter2D depth_mode red\n",
+ 30)) {
/* Requires GL 3.0 or GL_ARB_texture_rg */
glTexParameteri(GL_TEXTURE_2D,
GL_DEPTH_TEXTURE_MODE_ARB,
GL_RED);
} else if (!strncmp(line,
- "texparameter depth_mode luminance\n",
- 34)) {
+ "texparameter2D depth_mode luminance\n",
+ 36)) {
glTexParameteri(GL_TEXTURE_2D,
GL_DEPTH_TEXTURE_MODE_ARB,
GL_LUMINANCE);
} else if (!strncmp(line,
- "texparameter depth_mode intensity\n",
- 34)) {
+ "texparameter2D depth_mode intensity\n",
+ 36)) {
glTexParameteri(GL_TEXTURE_2D,
GL_DEPTH_TEXTURE_MODE_ARB,
GL_INTENSITY);
} else if (!strncmp(line,
- "texparameter depth_mode alpha\n",
- 29)) {
+ "texparameter2D depth_mode alpha\n",
+ 31)) {
glTexParameteri(GL_TEXTURE_2D,
GL_DEPTH_TEXTURE_MODE_ARB,
GL_ALPHA);
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 cf0a720..5bb3833 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func greater
+texparameter2D depth_mode luminance
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 10dcbcb..ef6b902 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func always
+texparameter2D depth_mode luminance
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 27669b1..161067b 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func never
+texparameter2D depth_mode luminance
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 39b719d..d5a72ba 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func greater
+texparameter2D depth_mode intensity
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 e1a1837..bbe151e 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func always
+texparameter2D depth_mode intensity
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 d2fd5f4..78d0519 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func never
+texparameter2D depth_mode intensity
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 8f50c44..ab7c657 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func greater
+texparameter2D depth_mode alpha
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 49adcff..90cb819 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func always
+texparameter2D depth_mode alpha
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 bf85d29..c600e53 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
@@ -16,8 +16,8 @@ glsl-fs-shadow2DGradARB.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func never
+texparameter2D depth_mode alpha
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 8eb0b0f..257f2a8 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
@@ -24,8 +24,8 @@ texture shadow2D 0 (32, 32)
### glsl-fs-shadow2DGradARB-01.shader_test
###
clear
-texparameter depth_mode luminance
-texparameter compare_func greater
+texparameter2D depth_mode luminance
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
@@ -40,8 +40,8 @@ relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
### glsl-fs-shadow2DGradARB-02.shader_test
###
clear
-texparameter depth_mode luminance
-texparameter compare_func always
+texparameter2D depth_mode luminance
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
@@ -56,8 +56,8 @@ relative probe rgba (1.0, 0.9) (1.0, 1.0, 1.0, 1.0)
### glsl-fs-shadow2DGradARB-03.shader_test
###
clear
-texparameter depth_mode luminance
-texparameter compare_func never
+texparameter2D depth_mode luminance
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
@@ -72,8 +72,8 @@ relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
### glsl-fs-shadow2DGradARB-04.shader_test
###
clear
-texparameter depth_mode intensity
-texparameter compare_func greater
+texparameter2D depth_mode intensity
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
@@ -88,8 +88,8 @@ relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
### glsl-fs-shadow2DGradARB-05.shader_test
###
clear
-texparameter depth_mode intensity
-texparameter compare_func always
+texparameter2D depth_mode intensity
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
@@ -104,8 +104,8 @@ relative probe rgba (1.0, 0.9) (1.0, 1.0, 1.0, 1.0)
### glsl-fs-shadow2DGradARB-06.shader_test
###
clear
-texparameter depth_mode intensity
-texparameter compare_func never
+texparameter2D depth_mode intensity
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
@@ -120,8 +120,8 @@ relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
### glsl-fs-shadow2DGradARB-07.shader_test
###
clear
-texparameter depth_mode alpha
-texparameter compare_func greater
+texparameter2D depth_mode alpha
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
@@ -136,8 +136,8 @@ relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
### glsl-fs-shadow2DGradARB-08.shader_test
###
clear
-texparameter depth_mode alpha
-texparameter compare_func always
+texparameter2D depth_mode alpha
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
@@ -152,8 +152,8 @@ relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
### glsl-fs-shadow2DGradARB-09.shader_test
###
clear
-texparameter depth_mode alpha
-texparameter compare_func never
+texparameter2D depth_mode alpha
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 d434a0a..8b30bd4 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
@@ -23,8 +23,8 @@ fs-shadow2d.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode red
-texparameter compare_func greater
+texparameter2D depth_mode red
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 f38d45d..c55c3e6 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
@@ -23,8 +23,8 @@ fs-shadow2d.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode red
-texparameter compare_func always
+texparameter2D depth_mode red
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 4c939b4..4411872 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
@@ -23,8 +23,8 @@ fs-shadow2d.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode red
-texparameter compare_func never
+texparameter2D depth_mode red
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test
index c52d67f..99da51f 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-01.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func greater
+texparameter2D depth_mode luminance
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test
index 6a181d0..13908c0 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-02.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func always
+texparameter2D depth_mode luminance
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test
index d386006..ca74a70 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-03.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func never
+texparameter2D depth_mode luminance
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test
index 10c734c..75fc8af 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-04.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func greater
+texparameter2D depth_mode intensity
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test
index b1076e0..d0660a1 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-05.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func always
+texparameter2D depth_mode intensity
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test
index cc669b9..d754a91 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-06.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func never
+texparameter2D depth_mode intensity
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test
index 1dab5af..aaf0b6c 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-07.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func greater
+texparameter2D depth_mode alpha
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test
index 5ec453a..2f3a46f 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-08.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func always
+texparameter2D depth_mode alpha
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test
index 2b70af8..679cd67 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-09.shader_test
@@ -15,8 +15,8 @@ glsl-fs-shadow2D.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func never
+texparameter2D depth_mode alpha
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 1bbdaad..317fb34 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
@@ -16,8 +16,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode red
-texparameter compare_func greater
+texparameter2D depth_mode red
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 c5b6cae..1224eea 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
@@ -16,8 +16,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode red
-texparameter compare_func always
+texparameter2D depth_mode red
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 f072206..2318d3d 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
@@ -16,8 +16,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode red
-texparameter compare_func never
+texparameter2D depth_mode red
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 4f10faf..262a0c3 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func greater
+texparameter2D depth_mode luminance
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 b49cbd9..82dc86e 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func always
+texparameter2D depth_mode luminance
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 4a23d3f..3a44060 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode luminance
-texparameter compare_func never
+texparameter2D depth_mode luminance
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 474dad7..b85e5fd 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func greater
+texparameter2D depth_mode intensity
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 7a0037e..7a59387 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func always
+texparameter2D depth_mode intensity
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 dbe862a..59760a1 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode intensity
-texparameter compare_func never
+texparameter2D depth_mode intensity
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
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 e8df8eb..9d6ea1a 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func greater
+texparameter2D depth_mode alpha
+texparameter2D compare_func greater
draw rect -1 -1 2 2
# depth comparison pass
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 7598fa2..d5d43a9 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func always
+texparameter2D depth_mode alpha
+texparameter2D compare_func always
draw rect -1 -1 2 2
# depth comparison pass
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 96ad092..f678b08 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
@@ -15,8 +15,8 @@ fs-texture-sampler2dshadow.frag
[test]
uniform int tex 0
texture shadow2D 0 (32, 32)
-texparameter depth_mode alpha
-texparameter compare_func never
+texparameter2D depth_mode alpha
+texparameter2D compare_func never
draw rect -1 -1 2 2
# depth comparison pass
--
1.7.4.1
More information about the Piglit
mailing list