From: Ian Romanick <[email protected]> Instead of replicating the same code over and over and over, just put it in one file that each shader test can reference.
Signed-off-by: Ian Romanick <[email protected]> Cc: Matt Turner <[email protected]> --- .../execution/const-var-non-constant-expr.shader_test | 9 ++------- .../execution/implicit-return-type-conversion.shader_test | 9 ++------- .../execution/length-matrix.shader_test | 9 ++------- .../execution/length-vector.shader_test | 9 ++------- tests/spec/arb_shading_language_420pack/execution/passthrough.vs | 6 ++++++ .../execution/scalar-swizzle.shader_test | 9 ++------- 6 files changed, 16 insertions(+), 35 deletions(-) create mode 100644 tests/spec/arb_shading_language_420pack/execution/passthrough.vs diff --git a/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test b/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test index f0fac63..ed4f67c 100644 --- a/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test +++ b/tests/spec/arb_shading_language_420pack/execution/const-var-non-constant-expr.shader_test @@ -16,13 +16,8 @@ GLSL >= 1.30 GL_ARB_shading_language_420pack -[vertex shader] -attribute vec4 vertex; - -void main() -{ - gl_Position = vertex; -} +[vertex shader file] +passthrough.vs [fragment shader] #extension GL_ARB_shading_language_420pack: enable diff --git a/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test b/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test index d2499b5..31dd0bf 100644 --- a/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test +++ b/tests/spec/arb_shading_language_420pack/execution/implicit-return-type-conversion.shader_test @@ -13,13 +13,8 @@ GLSL >= 1.30 GL_ARB_shading_language_420pack -[vertex shader] -attribute vec4 vertex; - -void main() -{ - gl_Position = vertex; -} +[vertex shader file] +passthrough.vs [fragment shader] #extension GL_ARB_shading_language_420pack: enable diff --git a/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test b/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test index c1cb189..bb9d3e7 100644 --- a/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test +++ b/tests/spec/arb_shading_language_420pack/execution/length-matrix.shader_test @@ -17,13 +17,8 @@ GLSL >= 1.30 GL_ARB_shading_language_420pack -[vertex shader] -attribute vec4 vertex; - -void main() -{ - gl_Position = vertex; -} +[vertex shader file] +passthrough.vs [fragment shader] #extension GL_ARB_shading_language_420pack: enable diff --git a/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test b/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test index 0e9e231..04adb41 100644 --- a/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test +++ b/tests/spec/arb_shading_language_420pack/execution/length-vector.shader_test @@ -17,13 +17,8 @@ GLSL >= 1.30 GL_ARB_shading_language_420pack -[vertex shader] -attribute vec4 vertex; - -void main() -{ - gl_Position = vertex; -} +[vertex shader file] +passthrough.vs [fragment shader] #extension GL_ARB_shading_language_420pack: enable diff --git a/tests/spec/arb_shading_language_420pack/execution/passthrough.vs b/tests/spec/arb_shading_language_420pack/execution/passthrough.vs new file mode 100644 index 0000000..d002d71 --- /dev/null +++ b/tests/spec/arb_shading_language_420pack/execution/passthrough.vs @@ -0,0 +1,6 @@ +in vec4 vertex; + +void main() +{ + gl_Position = vertex; +} diff --git a/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test b/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test index 1c632ad..8caed04 100644 --- a/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test +++ b/tests/spec/arb_shading_language_420pack/execution/scalar-swizzle.shader_test @@ -17,13 +17,8 @@ GLSL >= 1.30 GL_ARB_shading_language_420pack -[vertex shader] -attribute vec4 vertex; - -void main() -{ - gl_Position = vertex; -} +[vertex shader file] +passthrough.vs [fragment shader] #extension GL_ARB_shading_language_420pack: enable -- 1.8.1.4 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
