diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2016-05-05 17:16:31 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2016-06-17 14:24:59 -0700 |
| commit | 89458dd27009efcc54cad0ef391dd7e26682ffe0 (patch) | |
| tree | cad939375dc24f5579402e79138c32090e2676c5 | |
| parent | 00ad3b38bcdd95b218cd0e17cea4661b36e08c92 (diff) | |
shaders: port "GLSL link array-of-struct-of-array" to shader_runner
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | tests/all.py | 4 | ||||
| -rw-r--r-- | tests/spec/glsl-1.10/linker/link-array-of-struct-of-array.shader_test (renamed from tests/shaders/glsl-link-struct-array.frag) | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/all.py b/tests/all.py index 8c3fc559f..7d1bd4706 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 index eaf8f0736..ef828ecaf 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 |