[Piglit] [PATCH 2/4] glsl-1.20: Move notEqual tests from shaders to spec/glsl-1.20

Ian Romanick idr at freedesktop.org
Mon Mar 23 12:02:05 PDT 2015


From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Dylan Baker <baker.dylan.c at gmail.com>
---
 .../shaders/glsl-const-builtin-notEqual-bool.shader_test | 16 ----------------
 tests/shaders/glsl-const-builtin-notEqual.shader_test    | 16 ----------------
 .../fs-notEqual-const-of-const-bvec3.shader_test         | 16 ++++++++++++++++
 .../fs-notEqual-const-of-const-vec3.shader_test          | 16 ++++++++++++++++
 4 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 tests/shaders/glsl-const-builtin-notEqual-bool.shader_test
 delete mode 100644 tests/shaders/glsl-const-builtin-notEqual.shader_test
 create mode 100644 tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-bvec3.shader_test
 create mode 100644 tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-vec3.shader_test

diff --git a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test b/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test
deleted file mode 100644
index 8397892..0000000
--- a/tests/shaders/glsl-const-builtin-notEqual-bool.shader_test
+++ /dev/null
@@ -1,16 +0,0 @@
-[require]
-GLSL >= 1.20
-
-[vertex shader passthrough]
-
-[fragment shader]
-void main() {
-   const bvec3 x = bvec3(false, false, true);
-   const bvec3 y = bvec3(false, true, true);
-   const bvec3 result = notEqual(x,y);
-   gl_FragColor = vec4(result, 1.0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgb 0.0 1.0 0.0
diff --git a/tests/shaders/glsl-const-builtin-notEqual.shader_test b/tests/shaders/glsl-const-builtin-notEqual.shader_test
deleted file mode 100644
index 9dee00a..0000000
--- a/tests/shaders/glsl-const-builtin-notEqual.shader_test
+++ /dev/null
@@ -1,16 +0,0 @@
-[require]
-GLSL >= 1.20
-
-[vertex shader passthrough]
-
-[fragment shader]
-void main() {
-   const vec3 small = vec3(1.0, 2.0, 3.0);
-   const vec3 large = vec3(0.5, 2.0, 6.0);
-   const bvec3 result = notEqual(large, small);
-   gl_FragColor = vec4(result, 1.0);
-}
-
-[test]
-draw rect -1 -1 2 2
-probe all rgb 1.0 0.0 1.0
diff --git a/tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-bvec3.shader_test b/tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-bvec3.shader_test
new file mode 100644
index 0000000..8397892
--- /dev/null
+++ b/tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-bvec3.shader_test
@@ -0,0 +1,16 @@
+[require]
+GLSL >= 1.20
+
+[vertex shader passthrough]
+
+[fragment shader]
+void main() {
+   const bvec3 x = bvec3(false, false, true);
+   const bvec3 y = bvec3(false, true, true);
+   const bvec3 result = notEqual(x,y);
+   gl_FragColor = vec4(result, 1.0);
+}
+
+[test]
+draw rect -1 -1 2 2
+probe all rgb 0.0 1.0 0.0
diff --git a/tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-vec3.shader_test b/tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-vec3.shader_test
new file mode 100644
index 0000000..9dee00a
--- /dev/null
+++ b/tests/spec/glsl-1.20/execution/fs-notEqual-const-of-const-vec3.shader_test
@@ -0,0 +1,16 @@
+[require]
+GLSL >= 1.20
+
+[vertex shader passthrough]
+
+[fragment shader]
+void main() {
+   const vec3 small = vec3(1.0, 2.0, 3.0);
+   const vec3 large = vec3(0.5, 2.0, 6.0);
+   const bvec3 result = notEqual(large, small);
+   gl_FragColor = vec4(result, 1.0);
+}
+
+[test]
+draw rect -1 -1 2 2
+probe all rgb 1.0 0.0 1.0
-- 
2.1.0



More information about the Piglit mailing list