<div dir="ltr">On 16 September 2013 09:35, Nicholas Mack <span dir="ltr"><<a href="mailto:nichmack@gmail.com" target="_blank">nichmack@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">---<br>
.../compiler/layout-in-only-input-qualifier.geom | 23 +++++++++++++++++++++<br>
.../compiler/layout-in-only-one-qualifier-id.geom | 24 ++++++++++++++++++++++<br>
2 files changed, 47 insertions(+)<br>
create mode 100644 tests/spec/glsl-1.50/compiler/layout-in-only-input-qualifier.geom<br>
create mode 100644 tests/spec/glsl-1.50/compiler/layout-in-only-one-qualifier-id.geom <br></blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
diff --git a/tests/spec/glsl-1.50/compiler/layout-in-only-input-qualifier.geom b/tests/spec/glsl-1.50/compiler/layout-in-only-input-qualifier.geom<br>
new file mode 100644<br>
index 0000000..74902bc<br>
--- /dev/null<br>
+++ b/tests/spec/glsl-1.50/compiler/layout-in-only-input-qualifier.geom<br>
@@ -0,0 +1,23 @@<br>
+// [config]<br>
+// expect_result: fail<br>
+// glsl_version: 1.50<br>
+// check_link: true<br>
+// [end config]<br>
+//<br>
+// Section 4.3.8.1(Input Layout Qualifiers) of the GLSL 1.50 spec says:<br>
+// "Geometry shaders allow input layout qualifiers only on the interface<br>
+// qualifier in, not on an input block, block member, or variable. The layout<br>
+// qualifier identifiers for geometry shader inputs are<br>
+// points<br>
+// lines<br>
+// lines_adjacency<br>
+// triangles<br>
+// triangles_adjacency"<br>
+<br>
+#version 150<br>
+<br>
+layout(line_strip) in;<br></blockquote><div><br></div><div>Do we need this test? It seems like patch 1/4 already verifies that setting a geometry shader input layout of line_strip is disallowed.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+<br>
+void main()<br>
+{<br>
+}<br></blockquote><div><br></div><div>Since the config block specifies "check_link: true", we need a geometry shader that would link successfully if it weren't for the error condition you are trying to test (otherwise the test will pass for the wrong reason). So I believe we need to add something like "layout(triangle_strip, max_vertices = 3) out;"<br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
diff --git a/tests/spec/glsl-1.50/compiler/layout-in-only-one-qualifier-id.geom b/tests/spec/glsl-1.50/compiler/layout-in-only-one-qualifier-id.geom<br>
new file mode 100644<br>
index 0000000..4edd840<br>
--- /dev/null<br>
+++ b/tests/spec/glsl-1.50/compiler/layout-in-only-one-qualifier-id.geom<br>
@@ -0,0 +1,24 @@<br>
+// [config]<br>
+// expect_result: fail<br>
+// glsl_version: 1.50<br>
+// check_link: true<br>
+// [end config]<br>
+//<br>
+// Section 4.3.8.1(Input Layout Qualifiers) of the GLSL 1.50 spec says:<br>
+// "Geometry shaders allow input layout qualifiers only on the interface<br>
+// qualifier in, not on an input block, block member, or variable. The layout<br>
+// qualifier identifiers for geometry shader inputs are<br>
+// points<br>
+// lines<br>
+// lines_adjacency<br>
+// triangles<br>
+// triangles_adjacency<br>
+// Only one argument is accepted."<br>
+<br>
+#version 150<br>
+<br>
+layout(points, triangles_adjacency) in;<br></blockquote><div><br></div><div>Similarly, here we should add something like "layout(triangle_strip, max_vertices = 3) out;".</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+<br>
+void main()<br>
+{<br>
+}<br>
<span class=""><font color="#888888">--<br>
1.8.3.1<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</font></span></blockquote></div><br></div></div>