Also drop the "glsl-" prefix as most tests in spec/glsl-1.10/execution
don't seem to have that.
Suggested by Timothy Arceri.
---
.../glsl-vs-swizzle-swizzle-lhs-2.shader_test | 21 ---------------------
.../glsl-vs-swizzle-swizzle-lhs-3.shader_test | 21 ---------------------
.../shaders/glsl-vs-swizzle-swizzle-lhs.shader_test | 21 ---------------------
.../shaders/glsl-vs-swizzle-swizzle-rhs.shader_test | 20 --------------------
.../execution/vs-swizzle-swizzle-lhs-2.shader_test | 21 +++++++++++++++++++++
.../execution/vs-swizzle-swizzle-lhs-3.shader_test | 21 +++++++++++++++++++++
.../execution/vs-swizzle-swizzle-lhs.shader_test | 21 +++++++++++++++++++++
.../execution/vs-swizzle-swizzle-rhs.shader_test | 20 ++++++++++++++++++++
8 files changed, 83 insertions(+), 83 deletions(-)
delete mode 100644 tests/shaders/glsl-vs-swizzle-swizzle-lhs-2.shader_test
delete mode 100644 tests/shaders/glsl-vs-swizzle-swizzle-lhs-3.shader_test
delete mode 100644 tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test
delete mode 100644 tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test
create mode 100644
tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-2.shader_test
create mode 100644
tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-3.shader_test
create mode 100644
tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs.shader_test
create mode 100644
tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-rhs.shader_test
diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-lhs-2.shader_test
b/tests/shaders/glsl-vs-swizzle-swizzle-lhs-2.shader_test
deleted file mode 100644
index 98b682b..0000000
--- a/tests/shaders/glsl-vs-swizzle-swizzle-lhs-2.shader_test
+++ /dev/null
@@ -1,21 +0,0 @@
-[require]
-GLSL >= 1.10
-
-[vertex shader]
-void main()
-{
- vec4 color = vec4(0.1, 0.2, 0.3, 0.4);
- color.xy.x = 1.0;
- gl_FrontColor = color;
- gl_Position = gl_Vertex;
-}
-
-[fragment shader]
-void main()
-{
- gl_FragColor = gl_Color;
-}
-
-[test]
-draw rect -1 -1 2 2
-probe rgba 1 1 1.0 0.2 0.3 0.4
diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-lhs-3.shader_test
b/tests/shaders/glsl-vs-swizzle-swizzle-lhs-3.shader_test
deleted file mode 100644
index 3213c25..0000000
--- a/tests/shaders/glsl-vs-swizzle-swizzle-lhs-3.shader_test
+++ /dev/null
@@ -1,21 +0,0 @@
-[require]
-GLSL >= 1.10
-
-[vertex shader]
-void main()
-{
- vec4 color = vec4(0.1, 0.2, 0.3, 0.4);
- color.wxz.yx.y = 1.0;
- gl_FrontColor = color;
- gl_Position = gl_Vertex;
-}
-
-[fragment shader]
-void main()
-{
- gl_FragColor = gl_Color;
-}
-
-[test]
-draw rect -1 -1 2 2
-probe rgba 1 1 0.1 0.2 0.3 1.0
diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test
b/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test
deleted file mode 100644
index 64ac072..0000000
--- a/tests/shaders/glsl-vs-swizzle-swizzle-lhs.shader_test
+++ /dev/null
@@ -1,21 +0,0 @@
-[require]
-GLSL >= 1.10
-
-[vertex shader]
-void main()
-{
- vec4 color = vec4(0.0, 0.0, 0.0, 0.0);
- color.xzy.z = 1.0;
- gl_FrontColor = color;
- gl_Position = gl_Vertex;
-}
-
-[fragment shader]
-void main()
-{
- gl_FragColor = gl_Color;
-}
-
-[test]
-draw rect -1 -1 2 2
-probe rgb 1 1 0.0 1.0 0.0
diff --git a/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test
b/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test
deleted file mode 100644
index 6931b81..0000000
--- a/tests/shaders/glsl-vs-swizzle-swizzle-rhs.shader_test
+++ /dev/null
@@ -1,20 +0,0 @@
-[require]
-GLSL >= 1.10
-
-[vertex shader]
-void main()
-{
- vec4 color = vec4(1.0, 0.0, 0.0, 0.0);
- gl_FrontColor = color.yzx.xzxx;
- gl_Position = gl_Vertex;
-}
-
-[fragment shader]
-void main()
-{
- gl_FragColor = gl_Color;
-}
-
-[test]
-draw rect -1 -1 2 2
-probe rgb 1 1 0.0 1.0 0.0
diff --git
a/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-2.shader_test
b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-2.shader_test
new file mode 100644
index 0000000..98b682b
--- /dev/null
+++ b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-2.shader_test
@@ -0,0 +1,21 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+void main()
+{
+ vec4 color = vec4(0.1, 0.2, 0.3, 0.4);
+ color.xy.x = 1.0;
+ gl_FrontColor = color;
+ gl_Position = gl_Vertex;
+}
+
+[fragment shader]
+void main()
+{
+ gl_FragColor = gl_Color;
+}
+
+[test]
+draw rect -1 -1 2 2
+probe rgba 1 1 1.0 0.2 0.3 0.4
diff --git
a/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-3.shader_test
b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-3.shader_test
new file mode 100644
index 0000000..3213c25
--- /dev/null
+++ b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs-3.shader_test
@@ -0,0 +1,21 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+void main()
+{
+ vec4 color = vec4(0.1, 0.2, 0.3, 0.4);
+ color.wxz.yx.y = 1.0;
+ gl_FrontColor = color;
+ gl_Position = gl_Vertex;
+}
+
+[fragment shader]
+void main()
+{
+ gl_FragColor = gl_Color;
+}
+
+[test]
+draw rect -1 -1 2 2
+probe rgba 1 1 0.1 0.2 0.3 1.0
diff --git a/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs.shader_test
b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs.shader_test
new file mode 100644
index 0000000..64ac072
--- /dev/null
+++ b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-lhs.shader_test
@@ -0,0 +1,21 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+void main()
+{
+ vec4 color = vec4(0.0, 0.0, 0.0, 0.0);
+ color.xzy.z = 1.0;
+ gl_FrontColor = color;
+ gl_Position = gl_Vertex;
+}
+
+[fragment shader]
+void main()
+{
+ gl_FragColor = gl_Color;
+}
+
+[test]
+draw rect -1 -1 2 2
+probe rgb 1 1 0.0 1.0 0.0
diff --git a/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-rhs.shader_test
b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-rhs.shader_test
new file mode 100644
index 0000000..6931b81
--- /dev/null
+++ b/tests/spec/glsl-1.10/execution/vs-swizzle-swizzle-rhs.shader_test
@@ -0,0 +1,20 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
+void main()
+{
+ vec4 color = vec4(1.0, 0.0, 0.0, 0.0);
+ gl_FrontColor = color.yzx.xzxx;
+ gl_Position = gl_Vertex;
+}
+
+[fragment shader]
+void main()
+{
+ gl_FragColor = gl_Color;
+}
+
+[test]
+draw rect -1 -1 2 2
+probe rgb 1 1 0.0 1.0 0.0
--
2.5.0
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
