[Piglit] [PATCH 07/13] glsl-1.40: Modify tests to use 'vertex shader passthrough'
Ian Romanick
idr at freedesktop.org
Tue Aug 27 18:45:50 PDT 2013
From: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
.../glsl-1.40/execution/gl_DepthRangeParameters.shader_test | 12 ++----------
.../spec/glsl-1.40/uniform_buffer/fs-array-copy.shader_test | 12 ++----------
tests/spec/glsl-1.40/uniform_buffer/fs-basic.shader_test | 12 ++----------
tests/spec/glsl-1.40/uniform_buffer/fs-bools.shader_test | 12 ++----------
.../spec/glsl-1.40/uniform_buffer/fs-bvec-array.shader_test | 12 ++----------
tests/spec/glsl-1.40/uniform_buffer/fs-exp2.shader_test | 12 ++----------
.../uniform_buffer/fs-float-array-const-index.shader_test | 12 ++----------
.../uniform_buffer/fs-float-array-variable-index.shader_test | 12 ++----------
tests/spec/glsl-1.40/uniform_buffer/fs-floats.shader_test | 12 ++----------
.../glsl-1.40/uniform_buffer/fs-mat4-row-major.shader_test | 12 ++----------
tests/spec/glsl-1.40/uniform_buffer/fs-mat4.shader_test | 12 ++----------
.../uniform_buffer/fs-saturated-vec-array.shader_test | 12 ++----------
.../uniform_buffer/fs-struct-copy-complicated.shader_test | 12 ++----------
.../spec/glsl-1.40/uniform_buffer/fs-struct-copy.shader_test | 12 ++----------
.../spec/glsl-1.40/uniform_buffer/fs-struct-pad.shader_test | 12 ++----------
tests/spec/glsl-1.40/uniform_buffer/fs-struct.shader_test | 12 ++----------
.../spec/glsl-1.40/uniform_buffer/fs-two-members.shader_test | 12 ++----------
17 files changed, 34 insertions(+), 170 deletions(-)
diff --git a/tests/spec/glsl-1.40/execution/gl_DepthRangeParameters.shader_test b/tests/spec/glsl-1.40/execution/gl_DepthRangeParameters.shader_test
index eec89fc..94a899b 100644
--- a/tests/spec/glsl-1.40/execution/gl_DepthRangeParameters.shader_test
+++ b/tests/spec/glsl-1.40/execution/gl_DepthRangeParameters.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -24,7 +16,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-array-copy.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-array-copy.shader_test
index bf3c972..e0171d5 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-array-copy.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-array-copy.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -27,7 +19,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-basic.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-basic.shader_test
index 42028a9..bcf76ae 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-basic.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-basic.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -24,7 +16,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-bools.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-bools.shader_test
index 99e6b45..4743818 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-bools.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-bools.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -27,7 +19,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-bvec-array.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-bvec-array.shader_test
index 2c2b032..e210351 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-bvec-array.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-bvec-array.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -25,7 +17,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-exp2.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-exp2.shader_test
index c2d8fa8..df44705 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-exp2.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-exp2.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -24,7 +16,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-const-index.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-const-index.shader_test
index 9b7876a..141d95c 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-const-index.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-const-index.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -24,7 +16,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-variable-index.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-variable-index.shader_test
index 93bf6ee..1ff2179 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-variable-index.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-float-array-variable-index.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -26,7 +18,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-floats.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-floats.shader_test
index 738d982..8bad701 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-floats.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-floats.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -27,7 +19,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-mat4-row-major.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-mat4-row-major.shader_test
index 3fb3fce..b942fd1 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-mat4-row-major.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-mat4-row-major.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -24,7 +16,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-mat4.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-mat4.shader_test
index 9c7585b..c4a43fb 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-mat4.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-mat4.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -24,7 +16,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-saturated-vec-array.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-saturated-vec-array.shader_test
index d540878..41836b1 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-saturated-vec-array.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-saturated-vec-array.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -28,7 +20,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy-complicated.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy-complicated.shader_test
index c799691..47162a9 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy-complicated.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy-complicated.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -94,7 +86,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy.shader_test
index 2ed1d8e..9bfa3eb 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-struct-copy.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -28,7 +20,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-struct-pad.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-struct-pad.shader_test
index b2a0141..4cf5fe4 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-struct-pad.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-struct-pad.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -39,7 +31,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-struct.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-struct.shader_test
index a7cd194..c485276 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-struct.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-struct.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -29,7 +21,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
diff --git a/tests/spec/glsl-1.40/uniform_buffer/fs-two-members.shader_test b/tests/spec/glsl-1.40/uniform_buffer/fs-two-members.shader_test
index 1ad730c..98bfcf7 100644
--- a/tests/spec/glsl-1.40/uniform_buffer/fs-two-members.shader_test
+++ b/tests/spec/glsl-1.40/uniform_buffer/fs-two-members.shader_test
@@ -1,15 +1,7 @@
[require]
GLSL >= 1.40
-[vertex shader]
-#version 140
-
-in vec4 vertex;
-
-void main()
-{
- gl_Position = vertex;
-}
+[vertex shader passthrough]
[fragment shader]
#version 140
@@ -25,7 +17,7 @@ void main()
}
[vertex data]
-vertex/float/2
+piglit_vertex/float/2
-1.0 -1.0
1.0 -1.0
1.0 1.0
--
1.8.1.4
More information about the Piglit
mailing list