[Piglit] [PATCH 3/6] shader_runner: stick to the default GL_LUMINANCE depth mode
Marek Olšák
maraeo at gmail.com
Sat Jul 20 11:29:42 PDT 2013
GL_DEPTH_TEXTURE_MODE cannot be changed in the core profile.
---
tests/shaders/shader_runner.c | 15 ---------------
.../glsl-fs-shadow2DRect.shader_test | 6 +++---
.../glsl-fs-shadow2DRectProj.shader_test | 6 +++---
.../glsl-fs-shadow1DArray-bias.shader_test | 6 +++---
.../ext_texture_array/glsl-fs-shadow1DArray.shader_test | 6 +++---
.../ext_texture_array/glsl-fs-shadow2DArray.shader_test | 6 +++---
.../execution/samplers/glsl-fs-shadow1D-bias.shader_test | 6 +++---
.../execution/samplers/glsl-fs-shadow1D.shader_test | 6 +++---
.../samplers/glsl-fs-shadow1DProj-bias.shader_test | 6 +++---
.../execution/samplers/glsl-fs-shadow1DProj.shader_test | 6 +++---
.../execution/samplers/glsl-fs-shadow2D-bias.shader_test | 6 +++---
.../execution/samplers/glsl-fs-shadow2D.shader_test | 6 +++---
.../samplers/glsl-fs-shadow2DProj-bias.shader_test | 6 +++---
.../execution/samplers/glsl-fs-shadow2DProj.shader_test | 6 +++---
.../glsl-1.40/execution/glsl-fs-shadow2DRect.shader_test | 6 +++---
.../execution/glsl-fs-shadow2DRectProj.shader_test | 6 +++---
16 files changed, 45 insertions(+), 60 deletions(-)
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 28be0ee..3315359 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -1832,9 +1832,6 @@ piglit_display(void)
glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_COMPARE_FUNC,
GL_GREATER);
- glTexParameteri(GL_TEXTURE_2D,
- GL_DEPTH_TEXTURE_MODE,
- GL_INTENSITY);
glEnable(GL_TEXTURE_2D);
} else if (sscanf(line,
@@ -1849,9 +1846,6 @@ piglit_display(void)
glTexParameteri(GL_TEXTURE_RECTANGLE,
GL_TEXTURE_COMPARE_FUNC,
GL_GREATER);
- glTexParameteri(GL_TEXTURE_RECTANGLE,
- GL_DEPTH_TEXTURE_MODE,
- GL_INTENSITY);
} else if (sscanf(line,
"texture shadow1D %d ( %d )",
&tex, &w) == 2) {
@@ -1864,9 +1858,6 @@ piglit_display(void)
glTexParameteri(GL_TEXTURE_1D,
GL_TEXTURE_COMPARE_FUNC,
GL_GREATER);
- glTexParameteri(GL_TEXTURE_1D,
- GL_DEPTH_TEXTURE_MODE,
- GL_INTENSITY);
} else if (sscanf(line,
"texture shadow1DArray %d ( %d , %d )",
&tex, &w, &l) == 3) {
@@ -1879,9 +1870,6 @@ piglit_display(void)
glTexParameteri(GL_TEXTURE_1D_ARRAY,
GL_TEXTURE_COMPARE_FUNC,
GL_GREATER);
- glTexParameteri(GL_TEXTURE_1D_ARRAY,
- GL_DEPTH_TEXTURE_MODE,
- GL_INTENSITY);
} else if (sscanf(line,
"texture shadow2DArray %d ( %d , %d , %d )",
&tex, &w, &h, &l) == 4) {
@@ -1894,9 +1882,6 @@ piglit_display(void)
glTexParameteri(GL_TEXTURE_2D_ARRAY,
GL_TEXTURE_COMPARE_FUNC,
GL_GREATER);
- glTexParameteri(GL_TEXTURE_2D_ARRAY,
- GL_DEPTH_TEXTURE_MODE,
- GL_INTENSITY);
} else if (string_match("texparameter ", line)) {
handle_texparameter(line + strlen("texparameter "));
} else if (string_match("uniform", line)) {
diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test
index 72ce736..cbba69d 100644
--- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test
+++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRect.shader_test
@@ -22,6 +22,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRectProj.shader_test b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRectProj.shader_test
index 22a9c28..c533df1 100644
--- a/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRectProj.shader_test
+++ b/tests/spec/arb_texture_rectangle/glsl-fs-shadow2DRectProj.shader_test
@@ -28,6 +28,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test
index 84cd64f..2c42f57 100644
--- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test
+++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray-bias.shader_test
@@ -25,6 +25,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test
index 5dee31e..f908df3 100644
--- a/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test
+++ b/tests/spec/ext_texture_array/glsl-fs-shadow1DArray.shader_test
@@ -24,6 +24,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test
index aa58405..cd437a9 100644
--- a/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test
+++ b/tests/spec/ext_texture_array/glsl-fs-shadow2DArray.shader_test
@@ -24,6 +24,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test
index 59519e7..060e0a0 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D-bias.shader_test
@@ -21,6 +21,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test
index cba45a3..edcb91d 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1D.shader_test
@@ -21,6 +21,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj-bias.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj-bias.shader_test
index 0f30307..f47bb4b 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj-bias.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj-bias.shader_test
@@ -27,6 +27,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj.shader_test
index 1ab4bf4..58f9a27 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow1DProj.shader_test
@@ -27,6 +27,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test
index 572f4d5..69035dc 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D-bias.shader_test
@@ -21,6 +21,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test
index cf35406..7f10bff 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2D.shader_test
@@ -21,6 +21,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj-bias.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj-bias.shader_test
index 170cb94..29fb009 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj-bias.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj-bias.shader_test
@@ -27,6 +27,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj.shader_test b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj.shader_test
index c84f372..711cf4c 100644
--- a/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj.shader_test
+++ b/tests/spec/glsl-1.10/execution/samplers/glsl-fs-shadow2DProj.shader_test
@@ -27,6 +27,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRect.shader_test b/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRect.shader_test
index d091784..cd8e5e1 100644
--- a/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRect.shader_test
+++ b/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRect.shader_test
@@ -37,6 +37,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
diff --git a/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRectProj.shader_test b/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRectProj.shader_test
index aeeb1fd..c961cb9 100644
--- a/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRectProj.shader_test
+++ b/tests/spec/glsl-1.40/execution/glsl-fs-shadow2DRectProj.shader_test
@@ -38,6 +38,6 @@ 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)
relative probe rgba (0.9, 1.0) (1.0, 1.0, 1.0, 1.0)
-relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 0.0)
-relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 0.0)
+relative probe rgba (0.1, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.0) (0.0, 0.0, 0.0, 1.0)
+relative probe rgba (1.0, 0.9) (0.0, 0.0, 0.0, 1.0)
--
1.8.1.2
More information about the Piglit
mailing list