[Piglit] [PATCH 2/2] Change the geometry shader output layouts from 'triangles' to 'triangle_strip' because 'triangles' should be invalid

[Nicholas Mack]

---
 tests/spec/glsl-1.50/compiler/layout-global-only-out.geom             | 2 +-
 tests/spec/glsl-1.50/compiler/output-struct.geom                      | 2 +-
 tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c       | 2 +-
 tests/spec/glsl-1.50/execution/varying-struct-basic-gs-fs.shader_test | 2 +-
 tests/spec/glsl-1.50/execution/varying-struct-basic-vs-gs.shader_test | 2 +-
 tests/spec/glsl-1.50/linker/gs-must-specify-input-type.shader_test    | 2 +-
 tests/spec/glsl-1.50/linker/gs-must-specify-max-vertices.shader_test  | 2 +-
 tests/spec/glsl-1.50/linker/gs-without-vs.shader_test                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/spec/glsl-1.50/compiler/layout-global-only-out.geom b/tests/spec/glsl-1.50/compiler/layout-global-only-out.geom
index 155f333..e574270 100644
--- a/tests/spec/glsl-1.50/compiler/layout-global-only-out.geom
+++ b/tests/spec/glsl-1.50/compiler/layout-global-only-out.geom
@@ -11,5 +11,5 @@
 
 void main()
 {
-	layout(triangles) out;
+	layout(triangle_strip) out;
 }
diff --git a/tests/spec/glsl-1.50/compiler/output-struct.geom b/tests/spec/glsl-1.50/compiler/output-struct.geom
index 290c957..1d751a0 100644
--- a/tests/spec/glsl-1.50/compiler/output-struct.geom
+++ b/tests/spec/glsl-1.50/compiler/output-struct.geom
@@ -18,7 +18,7 @@
 #version 150
 
 layout(triangles) in;
-layout(triangles) out;
+layout(triangle_strip) out;
 
 in int a[];
 in float b[];
diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c b/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c
index 0e8ecb4..8ce8253 100644
--- a/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c
+++ b/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c
@@ -66,7 +66,7 @@ static const char *gstemplate =
 	"#version 150\n"
 	"#define LAYOUT_TYPE %s\n"
 	"layout(LAYOUT_TYPE) in;\n"
-	"layout(triangles, max_vertices = 3) out;\n"
+	"layout(triangle_strip, max_vertices = 3) out;\n"
 	"in vec3 pos[];\n"
 	"void main() {\n"
 	"	for(int i = 0; i < pos.length(); i++) {\n"
diff --git a/tests/spec/glsl-1.50/execution/varying-struct-basic-gs-fs.shader_test b/tests/spec/glsl-1.50/execution/varying-struct-basic-gs-fs.shader_test
index e59e2b5..5529ff3 100644
--- a/tests/spec/glsl-1.50/execution/varying-struct-basic-gs-fs.shader_test
+++ b/tests/spec/glsl-1.50/execution/varying-struct-basic-gs-fs.shader_test
@@ -39,7 +39,7 @@ void main()
 uniform float ref;
 
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 
 in vec4 pos[];
 
diff --git a/tests/spec/glsl-1.50/execution/varying-struct-basic-vs-gs.shader_test b/tests/spec/glsl-1.50/execution/varying-struct-basic-vs-gs.shader_test
index 1b584fb..0a5b9b2 100644
--- a/tests/spec/glsl-1.50/execution/varying-struct-basic-vs-gs.shader_test
+++ b/tests/spec/glsl-1.50/execution/varying-struct-basic-vs-gs.shader_test
@@ -68,7 +68,7 @@ void main()
 uniform float ref;
 
 layout(triangles) in;
-layout(triangles, max_vertices=3) out;
+layout(triangle_strip, max_vertices=3) out;
 
 in vec4 pos[];
 
diff --git a/tests/spec/glsl-1.50/linker/gs-must-specify-input-type.shader_test b/tests/spec/glsl-1.50/linker/gs-must-specify-input-type.shader_test
index af4967b..9468ac2 100644
--- a/tests/spec/glsl-1.50/linker/gs-must-specify-input-type.shader_test
+++ b/tests/spec/glsl-1.50/linker/gs-must-specify-input-type.shader_test
@@ -26,7 +26,7 @@ void main()
 [geometry shader]
 #version 150
 
-layout(triangles, max_vertices = 3) out;
+layout(triangle_strip, max_vertices = 3) out;
 
 in vec4 vertex_to_gs[3];
 
diff --git a/tests/spec/glsl-1.50/linker/gs-must-specify-max-vertices.shader_test b/tests/spec/glsl-1.50/linker/gs-must-specify-max-vertices.shader_test
index 9126fec..a5932cd 100644
--- a/tests/spec/glsl-1.50/linker/gs-must-specify-max-vertices.shader_test
+++ b/tests/spec/glsl-1.50/linker/gs-must-specify-max-vertices.shader_test
@@ -27,7 +27,7 @@ void main()
 #version 150
 
 layout(triangles) in;
-layout(triangles) out;
+layout(triangle_strip) out;
 
 in vec4 vertex_to_gs[];
 
diff --git a/tests/spec/glsl-1.50/linker/gs-without-vs.shader_test b/tests/spec/glsl-1.50/linker/gs-without-vs.shader_test
index a241685..196689f 100644
--- a/tests/spec/glsl-1.50/linker/gs-without-vs.shader_test
+++ b/tests/spec/glsl-1.50/linker/gs-without-vs.shader_test
@@ -16,7 +16,7 @@ GLSL >= 1.50
 #version 150
 
 layout(triangles) in;
-layout(triangles, max_vertices = 3) out;
+layout(triangle_strip, max_vertices = 3) out;
 
 in vec4 vertex[3];
 
-- 
1.8.3.1