[Piglit] [PATCH] Delete GLSL ES 3.00 "nonflat" negative parser tests.

Kenneth Graunke kenneth at whitecape.org
Thu Oct 6 01:45:21 UTC 2016


The GLSL ES specification is being updated to remove the rule that
these tests are trying to enforce.  Now that ES has geometry and
tessellation shaders, it makes sense that it would move to follow
modern desktop GL rules, which don't enforce this restriction.

Bugzilla: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15465#c7
---
 .../nonflat-int-array.vert                         | 23 -----------------
 .../interpolation-qualifiers/nonflat-int.vert      | 22 ----------------
 .../interpolation-qualifiers/nonflat-ivec4.vert    | 22 ----------------
 .../interpolation-qualifiers/nonflat-uint.vert     | 22 ----------------
 .../interpolation-qualifiers/nonflat-uvec4.vert    | 22 ----------------
 .../varying-struct-nonflat-int.vert                | 29 ----------------------
 .../varying-struct-nonflat-uint.vert               | 29 ----------------------
 7 files changed, 169 deletions(-)
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-int.vert
 delete mode 100644 tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-uint.vert

diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert
deleted file mode 100644
index 6a5aa17..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int-array.vert
+++ /dev/null
@@ -1,23 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 3.00 es
-// check_link: true
-// [end config]
-//
-// Declare a non-flat integral vertex output.
-//
-// From section 4.3.6 ("Output Variables") of the GLSL ES 3.00 spec:
-//    "Vertex shader inputs that are, or contain, signed or unsigned
-//    integers or integer vectors must be qualified with the
-//    interpolation qualifier flat."
-
-#version 300 es
-
-out int[2] x;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	x[0] = 1;
-	x[1] = 2;
-}
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert
deleted file mode 100644
index 2e3dde0..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-int.vert
+++ /dev/null
@@ -1,22 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 3.00 es
-// check_link: true
-// [end config]
-//
-// Declare a non-flat integral vertex output.
-//
-// From section 4.3.6 ("Output Variables") of the GLSL ES 3.00 spec:
-//    "Vertex shader inputs that are, or contain, signed or unsigned
-//    integers or integer vectors must be qualified with the
-//    interpolation qualifier flat."
-
-#version 300 es
-
-out int x;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	x = 1;
-}
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert
deleted file mode 100644
index d28b885..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-ivec4.vert
+++ /dev/null
@@ -1,22 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 3.00 es
-// check_link: true
-// [end config]
-//
-// Declare a non-flat integral vertex output.
-//
-// From section 4.3.6 ("Output Variables") of the GLSL ES 3.00 spec:
-//    "Vertex shader inputs that are, or contain, signed or unsigned
-//    integers or integer vectors must be qualified with the
-//    interpolation qualifier flat."
-
-#version 300 es
-
-out ivec4 x;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	x = ivec4(1, 2, 3, 4);
-}
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert
deleted file mode 100644
index 6361db5..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uint.vert
+++ /dev/null
@@ -1,22 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 3.00 es
-// check_link: true
-// [end config]
-//
-// Declare a non-flat integral vertex output.
-//
-// From section 4.3.6 ("Output Variables") of the GLSL ES 3.00 spec:
-//    "Vertex shader inputs that are, or contain, signed or unsigned
-//    integers or integer vectors must be qualified with the
-//    interpolation qualifier flat."
-
-#version 300 es
-
-out uint x;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	x = 1u;
-}
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert
deleted file mode 100644
index 9425d0b..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/nonflat-uvec4.vert
+++ /dev/null
@@ -1,22 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 3.00 es
-// check_link: true
-// [end config]
-//
-// Declare a non-flat integral vertex output.
-//
-// From section 4.3.6 ("Output Variables") of the GLSL ES 3.00 spec:
-//    "Vertex shader inputs that are, or contain, signed or unsigned
-//    integers or integer vectors must be qualified with the
-//    interpolation qualifier flat."
-
-#version 300 es
-
-out uvec4 x;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	x = uvec4(1, 2, 3, 4);
-}
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-int.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-int.vert
deleted file mode 100644
index 66af6c7..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-int.vert
+++ /dev/null
@@ -1,29 +0,0 @@
-/* [config]
- * expect_result: fail
- * glsl_version: 3.00
- * check_link: true
- * [end config]
- *
- * From the GLSL ES 3.00 spec, Section 4.3.6 ("Output Variables"):
- *
- *     "Vertex shader outputs that are, or contain, signed or unsigned
- *     integers or integer vectors must be qualified with the
- *     interpolation qualifier flat."
- *
- * This test verifies that a non-flat varying struct containing
- * signed integral data is properly flagged as an error.
- */
-
-#version 300 es
-
-struct S {
-	int i;
-};
-
-out S foo;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	foo.i = 1;
-}
diff --git a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-uint.vert b/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-uint.vert
deleted file mode 100644
index 3a1ab3f..0000000
--- a/tests/spec/glsl-es-3.00/compiler/interpolation-qualifiers/varying-struct-nonflat-uint.vert
+++ /dev/null
@@ -1,29 +0,0 @@
-/* [config]
- * expect_result: fail
- * glsl_version: 3.00
- * check_link: true
- * [end config]
- *
- * From the GLSL ES 3.00 spec, Section 4.3.6 ("Output Variables"):
- *
- *     "Vertex shader outputs that are, or contain, signed or unsigned
- *     integers or integer vectors must be qualified with the
- *     interpolation qualifier flat."
- *
- * This test verifies that a non-flat varying struct containing
- * unsigned integral data is properly flagged as an error.
- */
-
-#version 300 es
-
-struct S {
-	uint u;
-};
-
-out S foo;
-
-void main()
-{
-	gl_Position = vec4(0.0);
-	foo.u = 1u;
-}
-- 
2.10.0



More information about the Piglit mailing list