[Piglit] [PATCH 2/5] glsl-es-1.00: p2 move glsl-1.00 to glsl-es-1.00

Tom Gall tom.gall at linaro.org
Thu Feb 14 15:03:52 PST 2013


Move contents of tests/spec/glsl-1.00/compiler/assignment-operators
to tests/spec/glsl-es-1.00/compiler/assignment-operators

Signed-off-by: Tom Gall <tom.gall at linaro.org>
---
 .../assign-array-prohibited.frag                   |   19 -------------------
 .../assign-array-prohibited.vert                   |   19 -------------------
 .../assignment-operators/modulus-assign-00.frag    |   20 --------------------
 .../assign-array-prohibited.frag                   |   19 +++++++++++++++++++
 .../assign-array-prohibited.vert                   |   19 +++++++++++++++++++
 .../assignment-operators/modulus-assign-00.frag    |   20 ++++++++++++++++++++
 6 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag
 delete mode 100644 tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert
 delete mode 100644 tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
 create mode 100644 tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag
 create mode 100644 tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert
 create mode 100644 tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag

diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag b/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag
deleted file mode 100644
index d33f053..0000000
--- a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag
+++ /dev/null
@@ -1,19 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 1.00
-// [end config]
-//
-// Check that assignment to an array is illegal in GLSL ES 1.00.
-//
-// From section 5.8 of the GLSL ES 1.00 spec:
-//     Array variables are l-values and may be passed to parameters
-//     declared as out or inout. However, they may not be used as the
-//     target of an assignment.
-
-#version 100
-
-void f(float x[2])
-{
-  float y[2];
-  y = x;
-}
diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert b/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert
deleted file mode 100644
index d33f053..0000000
--- a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert
+++ /dev/null
@@ -1,19 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 1.00
-// [end config]
-//
-// Check that assignment to an array is illegal in GLSL ES 1.00.
-//
-// From section 5.8 of the GLSL ES 1.00 spec:
-//     Array variables are l-values and may be passed to parameters
-//     declared as out or inout. However, they may not be used as the
-//     target of an assignment.
-
-#version 100
-
-void f(float x[2])
-{
-  float y[2];
-  y = x;
-}
diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
deleted file mode 100644
index 7b35a9a..0000000
--- a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
+++ /dev/null
@@ -1,20 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 1.00
-// [end config]
-//
-// The modulus assignment operator '%=' is reserved.
-//
-// From section 5.8 of the GLSL ES 1.00 spec:
-//     The assignments remainder into (%=), left shift by (<<=), right shift
-//     by (>>=), inclusive or into ( |=), and exclusive or into ( ^=) are
-//     reserved for future use.
-
-#version 100
-
-int
-f() {
-    int x = 19;
-    x %= 4;
-    return x;
-}
diff --git a/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag
new file mode 100644
index 0000000..d33f053
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag
@@ -0,0 +1,19 @@
+// [config]
+// expect_result: fail
+// glsl_version: 1.00
+// [end config]
+//
+// Check that assignment to an array is illegal in GLSL ES 1.00.
+//
+// From section 5.8 of the GLSL ES 1.00 spec:
+//     Array variables are l-values and may be passed to parameters
+//     declared as out or inout. However, they may not be used as the
+//     target of an assignment.
+
+#version 100
+
+void f(float x[2])
+{
+  float y[2];
+  y = x;
+}
diff --git a/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert
new file mode 100644
index 0000000..d33f053
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert
@@ -0,0 +1,19 @@
+// [config]
+// expect_result: fail
+// glsl_version: 1.00
+// [end config]
+//
+// Check that assignment to an array is illegal in GLSL ES 1.00.
+//
+// From section 5.8 of the GLSL ES 1.00 spec:
+//     Array variables are l-values and may be passed to parameters
+//     declared as out or inout. However, they may not be used as the
+//     target of an assignment.
+
+#version 100
+
+void f(float x[2])
+{
+  float y[2];
+  y = x;
+}
diff --git a/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag
new file mode 100644
index 0000000..7b35a9a
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag
@@ -0,0 +1,20 @@
+// [config]
+// expect_result: fail
+// glsl_version: 1.00
+// [end config]
+//
+// The modulus assignment operator '%=' is reserved.
+//
+// From section 5.8 of the GLSL ES 1.00 spec:
+//     The assignments remainder into (%=), left shift by (<<=), right shift
+//     by (>>=), inclusive or into ( |=), and exclusive or into ( ^=) are
+//     reserved for future use.
+
+#version 100
+
+int
+f() {
+    int x = 19;
+    x %= 4;
+    return x;
+}
-- 
1.7.10.4



More information about the Piglit mailing list