<div dir="ltr">On 27 September 2013 11:55, 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:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
.../glsl-1.50/linker/versions-mingled.shader_test | 29 ++++++++++++++++++++++<br>
1 file changed, 29 insertions(+)<br>
create mode 100644 tests/spec/glsl-1.50/linker/versions-mingled.shader_test<br>
<br>
diff --git a/tests/spec/glsl-1.50/linker/versions-mingled.shader_test b/tests/spec/glsl-1.50/linker/versions-mingled.shader_test<br>
new file mode 100644<br>
index 0000000..543a778<br>
--- /dev/null<br>
+++ b/tests/spec/glsl-1.50/linker/versions-mingled.shader_test<br>
@@ -0,0 +1,29 @@<br>
+# Tests that GLSL 1.40 and GLSL 1.50 shaders may be linked together<br>
+#<br>
+# GLSL 1.50 Spec, 3.3 ():<br></blockquote><div><br></div><div>Were you meaning to put something between the parentheses? (The section name, "Preprocessor", perhaps?)<br><br></div><div>The same comment applies to patch 2.<br>
<br></div><div>With that fixed, the series is:<br><br></div><div>Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+# "Shaders declaring version 1.40 of the shading language can be linked with<br>
+# shaders declaring version 1.50 in the same program."<br>
+[require]<br>
+GLSL >= 1.50<br>
+<br>
+[vertex shader]<br>
+#version 140<br>
+<br>
+in vec4 a;<br>
+<br>
+void main()<br>
+{<br>
+ gl_Position = a;<br>
+}<br>
+<br>
+[fragment shader]<br>
+#version 150<br>
+<br>
+void main()<br>
+{<br>
+ gl_FragColor = vec4(1.);<br>
+}<br>
+<br>
+[test]<br>
+<br>
+<br>
<span class="HOEnZb"><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>