<div dir="ltr">On 17 February 2013 10:31, Jordan Justen <<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>> wrote: <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">Signed-off-by: Jordan Justen <<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>> --- .../execution/interface-blocks-with-gs.shader_test | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 tests/spec/glsl-1.50/execution/interface-blocks-with-gs.shader_test diff --git a/tests/spec/glsl-1.50/execution/interface-blocks-with-gs.shader_test b/tests/spec/glsl-1.50/execution/interface-blocks-with-gs.shader_test new file mode 100644 index 0000000..c620f46 --- /dev/null +++ b/tests/spec/glsl-1.50/execution/interface-blocks-with-gs.shader_test @@ -0,0 +1,57 @@ +[require] +GL >= 3.1 </blockquote><div> </div><div>I think this should be "GL >= 3.2". </div><div>With that fixed, this is: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com" target="_blank">stereotype441@gmail.com</a>> I also sent out comments on patches 1 and 3. </div><div>One final note: a lot of these tests specifically validate a sentence or two from the GLSL spec, which is great. Generally for tests like these, I prefer to see the relevant text from the spec quoted as a comment in the test. This reduces the risk of someone coming along later and disabling the test because their implementation fails it and they think the test is wrong (this has happened in the past). It doesn't have to be much--see for instance tests/spec/glsl-1.50/compiler/no-statement-before-first-case.vert. This would be particularly valuable for patches 6 and 7, since as you point out, the nVidia binary driver fails some of these tests. </div><div>No need to go overboard of course--for example IMHO this patch is fine as is, since it doesn't test a specific line item from the spec, it just tests basic functionality of interface blocks. </div><div> In any case, the remainder of the series is: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com" target="_blank">stereotype441@gmail.com</a>> </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"> +GLSL >= 1.50 + +[vertex shader] +#version 150 + +in vec4 vertex; + +out block { + vec4 vertex_to_gs; +}; + +void main() +{ + vertex_to_gs = vertex; +} + +[geometry shader] +#version 150 + +layout(triangles) in; +layout(triangle_strip, max_vertices = 3) out; + +in block { + vec4 vertex_to_gs; +} inst[]; + +void main() +{ + for (int i = 0; i < 3; i++) { + gl_Position = inst[i].vertex_to_gs; + EmitVertex(); + } +} + +[fragment shader] +#version 150 + +out vec4 color; + +void main() +{ + color = vec4(0.0, 1.0, 0.0, 1.0); +} + +[vertex data] +vertex/float/2 +-1.0 -1.0 +-1.0 1.0 + 1.0 1.0 + 1.0 -1.0 + +[test] +draw arrays GL_TRIANGLE_FAN 0 4 +probe all rgba 0.0 1.0 0.0 1.0 + -- 1.7.10.4 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org" target="_blank">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div></div>