[Piglit] [PATCH 08/11] shaders: port "GLSL link array-of-struct-of-array" to shader_runner

Dylan Baker dylan at pnwbakers.com
Fri May 6 00:48:43 UTC 2016


Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py                                                       | 4 ----
 .../glsl-1.10/linker/link-array-of-struct-of-array.shader_test}    | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename tests/{shaders/glsl-link-struct-array.frag => spec/glsl-1.10/linker/link-array-of-struct-of-array.shader_test} (71%)

diff --git a/tests/all.py b/tests/all.py
index 4fa5d5b..dc5d282 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -605,10 +605,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g:
        os.path.join('shaders', 'glsl-link-centroid-01b.vert'),
        'fail'],
       'GLSL link mismatched centroid')
-    g(['glsl-link-test',
-       os.path.join('shaders', 'glsl-link-struct-array.frag'),
-       'pass'],
-      'GLSL link array-of-struct-of-array')
     g(['glsl-getactiveuniform-count',
        os.path.join('shaders', 'glsl-getactiveuniform-length.vert'), '1'],
       'glsl-getactiveuniform-count: {}'.format('glsl-getactiveuniform-length'))
diff --git a/tests/shaders/glsl-link-struct-array.frag b/tests/spec/glsl-1.10/linker/link-array-of-struct-of-array.shader_test
similarity index 71%
rename from tests/shaders/glsl-link-struct-array.frag
rename to tests/spec/glsl-1.10/linker/link-array-of-struct-of-array.shader_test
index eaf8f07..ef828ec 100644
--- a/tests/shaders/glsl-link-struct-array.frag
+++ b/tests/spec/glsl-1.10/linker/link-array-of-struct-of-array.shader_test
@@ -1,3 +1,7 @@
+[require]
+GLSL >= 1.10
+
+[fragment shader]
 struct s {
 	vec4 v[1];
 	float f;
@@ -10,3 +14,6 @@ void main()
 	a[0].f = 1.0;
 	gl_FragColor = vec4(0.0, a[0].f, 0.0 ,1.0);
 }
+
+[test]
+link success
-- 
2.8.2



More information about the Piglit mailing list