<div dir="ltr">On 27 July 2013 12:29, Jordan Justen <<a href="mailto:jljusten@gmail.com" target="_blank">jljusten@gmail.com</a>> wrote: <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"> Series Reviewed-by: Jordan Justen <<a href="mailto:jordan.l.justen@intel.com">jordan.l.justen@intel.com</a>> I was wondering if it would be worth continuing to support the gs4 tests? (PATCH 1) Probably not. One other note not directly related to this series. I tried running this series on an nVidia binary driver with GL 3.3 support. I ran: ./piglit-run.py -t glsl-1.50 tests/all.tests results Interestingly, the result was only about 50% of the tests passed. I saw a similar result on master. </blockquote><div> </div><div>Hmm, I don't seem to remember the pass rate being that bad on nVidia. I'll do a comparison on my system before pushing this series. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> -Jordan <div><div class="h5"> On Sat, Jul 27, 2013 at 6:10 AM, Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> wrote: > Previously, these tests used ARB_geometry_shader4. However, the > initial implementation of geometry shaders in Mesa isn't going to > support ARB_geometry_shader4. So test this functionality using GLSL > 1.50 geometry shaders instead. > --- > generated_tests/gen_builtin_uniform_tests.py | 35 +++++++++--------------- > generated_tests/gen_constant_array_size_tests.py | 9 ++---- > 2 files changed, 16 insertions(+), 28 deletions(-) > > diff --git a/generated_tests/gen_builtin_uniform_tests.py b/generated_tests/gen_builtin_uniform_tests.py > index e0b6da2..2fd1d67 100644 > --- a/generated_tests/gen_builtin_uniform_tests.py > +++ b/generated_tests/gen_builtin_uniform_tests.py > @@ -551,47 +551,38 @@ class GeometryShaderTest(ShaderTest): > def test_prefix(self): > return 'gs' > > - def make_additional_requirements(self): > - return 'GL_ARB_geometry_shader4\n' > + def glsl_version(self): > + return max(150, ShaderTest.glsl_version(self)) > > def make_vertex_shader(self): > shader = '' > - if self.glsl_version() >= 140: > - shader += "in vec4 vertex;\n" > + shader += "in vec4 vertex;\n" > + shader += "out vec4 vertex_to_gs;\n" > > shader += "void main()\n" > shader += "{\n" > - if self.glsl_version() >= 140: > - shader += " gl_Position = vertex;\n" > - else: > - shader += " gl_Position = gl_Vertex;\n" > + shader += " vertex_to_gs = vertex;\n" > shader += "}\n" > > return shader > > def make_geometry_shader(self): > - additional_declarations = \ > - '#extension GL_ARB_geometry_shader4: enable\n' > - if self.glsl_version() >= 130: > - additional_declarations += 'out vec4 color;\n' > - else: > - additional_declarations += 'varying out vec4 color;\n' > + additional_declarations = '' > + additional_declarations += 'layout(triangles) in;\n' > + additional_declarations \ > + += 'layout(triangle_strip, max_vertices = 3) out;\n' > + additional_declarations += 'in vec4 vertex_to_gs[3];\n' > + additional_declarations += 'out vec4 color;\n' > return self.make_test_shader( > additional_declarations, > ' vec4 tmp_color;\n', > 'tmp_color', > - ' for (int i = 0; i < gl_VerticesIn; i++) {\n' > - ' gl_Position = gl_PositionIn[i];\n' > + ' for (int i = 0; i < 3; i++) {\n' > + ' gl_Position = vertex_to_gs[i];\n' > ' color = tmp_color;\n' > ' EmitVertex();\n' > ' }\n') > > - def make_geometry_layout(self): > - layout = 'input type GL_TRIANGLES\n' > - layout += 'output type GL_TRIANGLE_STRIP\n' > - layout += 'vertices out 3\n' > - return layout > - > def make_fragment_shader(self): > shader = '''varying vec4 color; > > diff --git a/generated_tests/gen_constant_array_size_tests.py b/generated_tests/gen_constant_array_size_tests.py > index c1baf54..b56b875 100644 > --- a/generated_tests/gen_constant_array_size_tests.py > +++ b/generated_tests/gen_constant_array_size_tests.py > @@ -215,15 +215,12 @@ class GeometryParserTest(ParserTest): > """Derived class for tests that exercise the built-in in a geometry > shader. > """ > + def glsl_version(self): > + return max(150, ParserTest.glsl_version(self)) > + > def test_suffix(self): > return 'geom' > > - def additional_declarations(self): > - return '#extension GL_ARB_geometry_shader4: enable\n' > - > - def additional_extensions(self): > - return ['GL_ARB_geometry_shader4'] > - > def output_var(self): > return 'gl_Position' > > -- > 1.8.3.4 > </div></div>> _______________________________________________ > Piglit mailing list > <a href="mailto:Piglit@lists.freedesktop.org">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>