[Piglit] [PATCH] Add simple glPolygonOffset test

[Brian Paul]

On 04/26/2012 12:45 PM, Keith Packard wrote:
> This isn't fancy, it just sets the polygon offset and then draws one
> object on top of another. Tests combinations of lines/points/fills.
>
> Signed-off-by: Keith Packard<keithp at keithp.com>
> ---
>   tests/all.tests                 |    1 +
>   tests/general/CMakeLists.gl.txt |    1 +
>   tests/general/polygon-offset.c  |  126 +++++++++++++++++++++++++++++++++++++++
>   3 files changed, 128 insertions(+)
>   create mode 100644 tests/general/polygon-offset.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index bd16c42..af4b103 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -289,6 +289,7 @@ add_plain_test(general, 'pbo-teximage-tiling')
>   add_plain_test(general, 'pbo-teximage-tiling-2')
>   add_plain_test(general, 'point-line-no-cull')
>   add_plain_test(general, 'polygon-mode')
> +add_plain_test(general, 'polygon-offset')
>   add_plain_test(general, 'pos-array')
>   add_plain_test(general, 'primitive-restart')
>   add_plain_test(general, 'provoking-vertex')
> diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
> index 562a634..400126b 100644
> --- a/tests/general/CMakeLists.gl.txt
> +++ b/tests/general/CMakeLists.gl.txt
> @@ -82,6 +82,7 @@ piglit_add_executable (pbo-teximage-tiling pbo-teximage-tiling.c)
>   piglit_add_executable (pbo-teximage-tiling-2 pbo-teximage-tiling-2.c)
>   piglit_add_executable (point-line-no-cull point-line-no-cull.c)
>   piglit_add_executable (polygon-mode polygon-mode.c)
> +piglit_add_executable (polygon-offset polygon-offset.c)
>   piglit_add_executable (primitive-restart primitive-restart.c)
>   piglit_add_executable (provoking-vertex provoking-vertex.c)
>   piglit_add_executable (oes-read-format oes-read-format.c)
> diff --git a/tests/general/polygon-offset.c b/tests/general/polygon-offset.c
> new file mode 100644
> index 0000000..8245280
> --- /dev/null
> +++ b/tests/general/polygon-offset.c
> @@ -0,0 +1,126 @@
> +/*
> + * Copyright © 2009 Intel Corporation

2012?

> + *
> + * 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.
> + *
> + * Authors:
> + *    Ben Holmes<shranzel at hotmail.com>

Author?


> + */
> +
> +/*
> +* draws two triangles using different colors for each vert(1st-red, 2nd-green,
> +* 3rd-blue). first tri drawn using glProvokingVertexEXT set to
> +* GL_FIRST_VERTEX_CONVENTION_EXT.
> +* Second tri using GL_LAST_VERTEX_CONVENTION_EXT.

Description?


> +*/
> +
> +#include "piglit-util.h"
> +
> +int piglit_width = 400, piglit_height = 300;
> +int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
> +
> +	glShadeModel(GL_FLAT);
> +	glClearColor(0.2, 0.2, 0.2, 1.0);
> +
> +}
> +
> +float red[3] = {1.0, 0.0, 0.0};
> +float blue[3] = {0.0, 0.0, 1.0};
> +
> +#define SIZE	40
> +#define SPACE	50
> +
> +#define X(x)	((x) * SPACE + SIZE/2)
> +#define Y(y)	((y) * SPACE + SIZE/2)
> +
> +int	line_width;
> +
> +static void
> +do_rect(int x, int y, float color[3], int mode)
> +{
> +	glColor3fv(color);
> +	glPolygonMode(GL_FRONT_AND_BACK, mode);
> +	piglit_draw_rect_z(0, X(x), Y(y), SIZE, SIZE);
> +}
> +
> +static int
> +check(int x, int y, float color[3])
> +{
> +	return piglit_probe_pixel_rgb(X(x) + SIZE-line_width/4, Y(y) + SIZE - line_width/4, color);
> +}
> +
> +static int poly_mode[3] = { GL_FILL, GL_LINE, GL_POINT };
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	int	x = 0, y = 0;
> +	int	line_width_range[2];
> +	int	point_size_range[2];
> +	
> +	void step() {
> +		if (++x == 4) {
> +			x = 0;
> +			y++;
> +		}
> +	}

Let's not use nested functions.  Non-gnu compilers would probably 
choke on it (ex: llvm's C, I think).


> +
> +	GLboolean pass = GL_TRUE;

People are moving toward bool/true/false in the piglit tests.


> +	int	first_mode;
> +	int	second_mode;
> +	int	over;
> +
> +	glEnable(GL_DEPTH_TEST);
> +	glDepthFunc(GL_LESS);
> +	glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, line_width_range);
> +	line_width = line_width_range[1];
> +	glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_size_range);
> +	if (line_width>  point_size_range[1])
> +		line_width = point_size_range[1];
> +	glLineWidth(line_width);
> +	glPointSize(line_width);
> +	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
> +	glEnable(GL_POLYGON_OFFSET_FILL);
> +	glEnable(GL_POLYGON_OFFSET_POINT);
> +	glEnable(GL_POLYGON_OFFSET_LINE);
> +
> +	for (first_mode = 0; first_mode<  3; first_mode++) {
> +		for (second_mode = 0; second_mode<  3; second_mode++) {
> +			for (over = 0; over<  2; over++) {
> +				glPolygonOffset(0.0, 0.0);
> +				do_rect(x, y, red, poly_mode[first_mode]);
> +				glPolygonOffset(0.0, over ? -1.0 : 1.0);
> +				do_rect(x, y, blue, poly_mode[second_mode]);
> +				pass = pass&&  check(x, y, over ? blue : red);
> +				step();
> +			}
> +		}
> +	}
> +
> +	glFinish();

We don't need a glFinish() before swapping.

> +	glutSwapBuffers();

Should probably use piglit_present_results() instead.


> +
> +	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}

-Brian