[Piglit] [PATCH] Add a very basic version of the "primgen" test.

[Ben Widawsky]

On Wed, Nov 12, 2014 at 11:53:11AM -0800, Ben Widawsky wrote:
> On Wed, Nov 12, 2014 at 10:33:36AM -0800, Kenneth Graunke wrote:
> > We already test this functionality in position.c, but I've found this
> > test valuable when doing hardware enabling due to its simplicity:
> > 
> > - No clears (since those require the pixel pipeline to work)
> > - No rendering (rasterizer discard is enabled)
> > - Minimal vertex shading.
> > 
> > I retained Marek's copyright since this is largely cut and pasted from
> > his tests (primgen.c and position.c).
> > 
> > Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> > ---
> >  tests/all.py                                       |  1 +
> >  .../spec/ext_transform_feedback/CMakeLists.gl.txt  |  2 +
> >  .../pipeline-basic-primgen.c                       | 90 ++++++++++++++++++++++
> >  3 files changed, 93 insertions(+)
> >  create mode 100644 tests/spec/ext_transform_feedback/pipeline-basic-primgen.c
> > 
> > diff --git a/tests/all.py b/tests/all.py
> > index f2c5c1f..16d3cff 100644
> > --- a/tests/all.py
> > +++ b/tests/all.py
> > @@ -3121,6 +3121,7 @@ ext_transform_feedback['position-readback-bufferrange-discard'] = PiglitGLTest('
> >  
> >  ext_transform_feedback['negative-prims'] = PiglitGLTest('ext_transform_feedback-negative-prims', run_concurrent=True)
> >  ext_transform_feedback['primgen-query transform-feedback-disabled'] = PiglitGLTest('ext_transform_feedback-primgen', run_concurrent=True)
> > +ext_transform_feedback['pipeline-basic-primgen'] = PiglitGLTest('ext_transform_feedback-pipeline-basic-primgen', run_concurrent=True)
> >  
> >  ext_transform_feedback['position-render-bufferbase'] = PiglitGLTest('ext_transform_feedback-position render', run_concurrent=True)
> >  ext_transform_feedback['position-render-bufferbase-discard'] = PiglitGLTest('ext_transform_feedback-position render discard', run_concurrent=True)
> > diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
> > index 95af3a5..abf8ec2 100644
> > --- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
> > +++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
> > @@ -31,6 +31,8 @@ piglit_add_executable (ext_transform_feedback-intervening-read intervening-read.
> >  piglit_add_executable (ext_transform_feedback-max-varyings max-varyings.c)
> >  piglit_add_executable (ext_transform_feedback-negative-prims negative-prims.c)
> >  piglit_add_executable (ext_transform_feedback-nonflat-integral nonflat-integral.c)
> > +piglit_add_executable (ext_transform_feedback-pipeline-basic-primgen
> > +pipeline-basic-primgen.c)
> 
> Did you mean for this line wrap

Sorry, ignore this. I changed some mail settings recently, and my client
wrapped it.

> 
> >  piglit_add_executable (ext_transform_feedback-primgen primgen.c)
> >  piglit_add_executable (ext_transform_feedback-separate separate.c)
> >  piglit_add_executable (ext_transform_feedback-output-type output-type.c)
> > diff --git a/tests/spec/ext_transform_feedback/pipeline-basic-primgen.c b/tests/spec/ext_transform_feedback/pipeline-basic-primgen.c
> > new file mode 100644
> > index 0000000..e5b6a4e
> > --- /dev/null
> > +++ b/tests/spec/ext_transform_feedback/pipeline-basic-primgen.c
> > @@ -0,0 +1,90 @@
> > +/*
> > + * Copyright © 2013 Marek Olšák <maraeo at gmail.com>
> > + * Copyright © 2013 Intel Corporation
> 
> 2014?
> 
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining a
> > + * copy of this software and associated documentation files (the "Software"),
> > + * to deal in the Software without restriction, including without limitation
> > + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> > + * and/or sell copies of the Software, and to permit persons to whom the
> > + * Software is furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice (including the next
> > + * paragraph) shall be included in all copies or substantial portions of the
> > + * Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > + * IN THE SOFTWARE.
> > + */
> > +
> > +/**
> > + * Tests if PRIMITIVES_GENERATED works with transform feedback disabled.
> > + *
> > + * From EXT_transform_feedback:
> > + *    "the primitives-generated count is incremented every time a primitive
> > + *     reaches the Discarding Rasterization stage"
> > + */
> > +
> > +#include "piglit-util-gl.h"
> > +
> > +PIGLIT_GL_TEST_CONFIG_BEGIN
> > +
> > +	config.supports_gl_compat_version = 10;
> > +	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> > +
> > +PIGLIT_GL_TEST_CONFIG_END
> > +
> > +static const char *vstext = "void main() { gl_Position = gl_Vertex; }";
> > +
> > +void piglit_init(int argc, char **argv)
> > +{
> > +	unsigned qresult;
> > +	int expected = 2;
> > +	GLuint vs;
> > +	GLuint prog;
> > +	GLuint q;
> > +
> > +	/* Check the driver. */
> > +	piglit_require_gl_version(15);
> > +	piglit_require_GLSL();
> > +	piglit_require_transform_feedback();
> > +
> > +	glGenQueries(1, &q);
> > +
> > +	glEnable(GL_RASTERIZER_DISCARD);
> > +
> > +	/* Create shaders. */
> > +	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
> > +	prog = glCreateProgram();
> > +	glAttachShader(prog, vs);
> > +	glLinkProgram(prog);
> > +	if (!piglit_link_check_status(prog)) {
> > +		glDeleteProgram(prog);
> > +		piglit_report_result(PIGLIT_FAIL);
> > +	}
> > +	glUseProgram(prog);
> > +
> > +	/* Draw a rectangle; make sure two primitives were generated. */
> > +	glBeginQuery(GL_PRIMITIVES_GENERATED, q);
> > +	piglit_draw_rect(-1, -1, 2, 2);
> > +	glEndQuery(GL_PRIMITIVES_GENERATED);
> > +	glGetQueryObjectuiv(q, GL_QUERY_RESULT, &qresult);
> > +
> > +	if (qresult != expected) {
> > +		printf("Primitives generated: %i,  Expected: %i\n",
> > +		       qresult, expected);
> > +		piglit_report_result(PIGLIT_FAIL);
> > +	}
> 
> Generally for transform feedback and other query buffer stuff, I've
> wondered about wrap conditions. I haven't yet found where it's handled,
> but for this one in particular, that's total meh.
> 
> > +
> > +	piglit_report_result(PIGLIT_PASS);
> > +}
> > +
> > +enum piglit_result piglit_display(void)
> > +{
> > +	return PIGLIT_FAIL; /* should not get here */
> > +}
> > -- 
> > 2.1.3
> 
> Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
> Tested-by: Ben Widawsky <ben at bwidawsk.net>
> 
> -- 
> Ben Widawsky, Intel Open Source Technology Center

-- 
Ben Widawsky, Intel Open Source Technology Center