[Piglit] [PATCH 10/13] glsl-1.50: Modify tests to use 'vertex shader passthrough'

Ian Romanick idr at freedesktop.org
Tue Aug 27 18:45:53 PDT 2013


From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 .../execution/geometry/generate-zero-primitives.shader_test  | 12 ++----------
 tests/spec/glsl-1.50/execution/sanity.shader_test            | 11 ++---------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test b/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test
index 94aadb1..f648b34 100644
--- a/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test
+++ b/tests/spec/glsl-1.50/execution/geometry/generate-zero-primitives.shader_test
@@ -2,15 +2,7 @@
 GL >= 3.2
 GLSL >= 1.50
 
-[vertex shader]
-#version 150
-
-in vec4 vertex;
-
-void main()
-{
-	gl_Position = vertex;
-}
+[vertex shader passthrough]
 
 [geometry shader]
 #version 150
@@ -31,7 +23,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.50/execution/sanity.shader_test b/tests/spec/glsl-1.50/execution/sanity.shader_test
index cd8331d..96d1484 100644
--- a/tests/spec/glsl-1.50/execution/sanity.shader_test
+++ b/tests/spec/glsl-1.50/execution/sanity.shader_test
@@ -4,14 +4,7 @@
 GL >= 3.1
 GLSL >= 1.50
 
-[vertex shader]
-#version 150
-
-in vec4 vertex;
-
-void main() {
-    gl_Position = vertex;
-}
+[vertex shader passthrough]
 
 [fragment shader]
 #version 150
@@ -24,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