glsl-link-test is a very simple program, but all of it's tests can be implemented as shader_runner tests. It also has an annoying habit of not working when running out of tree. Rather than trying to fix that bug just start porting its few tests to shader_runner to delete it.
Signed-off-by: Dylan Baker <[email protected]> --- tests/all.py | 4 ---- .../global-single-initializer-2-shaders.shader_test | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 tests/spec/glsl-1.10/linker/global-single-initializer-2-shaders.shader_test diff --git a/tests/all.py b/tests/all.py index 395f964..33b6321 100644 --- a/tests/all.py +++ b/tests/all.py @@ -594,10 +594,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g: g(['point-vertex-id', 'gl_VertexID', 'gl_InstanceID', 'divisor']) g(['glsl-vs-int-attrib']) g(['glsl-link-test', - os.path.join('shaders', 'glsl-link-initializer-01a.vert'), - os.path.join('shaders', 'glsl-link-initializer-01b.vert'), 'pass'], - 'GLSL link single global initializer, 2 shaders') - g(['glsl-link-test', os.path.join('shaders', 'glsl-link-initializer-01c.vert'), os.path.join('shaders', 'glsl-link-initializer-01d.vert'), 'pass'], diff --git a/tests/spec/glsl-1.10/linker/global-single-initializer-2-shaders.shader_test b/tests/spec/glsl-1.10/linker/global-single-initializer-2-shaders.shader_test new file mode 100644 index 0000000..b8adcc6 --- /dev/null +++ b/tests/spec/glsl-1.10/linker/global-single-initializer-2-shaders.shader_test @@ -0,0 +1,21 @@ +[require] +GLSL >= 1.10 + +[vertex shader] +float global_variable; + +void main() +{ + gl_Position = gl_Vertex; +} + +[vertex shader] +float global_variable = 1.0; + +/* This works around a bug in Apple's GLSL compiler. Their compiler won't allow + * a shader doesn't have any executable code. + */ +void apple_work_around1() {} + +[test] +link success -- 2.8.2 _______________________________________________ Piglit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/piglit
