[Piglit] [PATCH] Add tests/general/polygon-stipple-fs
Brian Paul
brianp at vmware.com
Wed Aug 3 21:12:05 UTC 2016
On 08/03/2016 02:54 PM, Nicolai Hähnle wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> Test polygon stipple and its interaction with a simple fragment shader.
> Exposes a bug that lived in Gallium's stipple emulation for a very long
> time until it was hit by Kodi (reported by Christian König).
> ---
> I've had this on my disk for quite some time. The corresponding bug has been
> fixed some time ago, but we've had a regression (for a different reason) in
> radeonsi so it's really about time to send it out...
> --
> tests/all.py | 1 +
> tests/general/CMakeLists.gl.txt | 1 +
> tests/general/polygon-stipple-fs.c | 166 +++++++++++++++++++++++++++++++++++++
I think we'd like to get away from dumping new programs in
tests/general/, tests/bugs/ etc.
Does the test really require GL 3.0 or would 2.1 suffice?
Can we put this in tests/spec/gl-2.1/ for example?
> 3 files changed, 168 insertions(+)
> create mode 100644 tests/general/polygon-stipple-fs.c
>
> diff --git a/tests/all.py b/tests/all.py
> index e76f157..9ab1a6a 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -1148,6 +1148,7 @@ with profile.group_manager(
> g(['array-depth-roundtrip'], run_concurrent=False)
> g(['depth-cube-map'], run_concurrent=False)
> g(['sampler-cube-shadow'], run_concurrent=False)
> + g(['polygon-stipple-fs'])
> g(['generatemipmap-base-change', 'size'])
> g(['generatemipmap-base-change', 'format'])
> g(['generatemipmap-cubemap'])
> diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
> index 3a46fb0..23b8258 100644
> --- a/tests/general/CMakeLists.gl.txt
> +++ b/tests/general/CMakeLists.gl.txt
> @@ -90,6 +90,7 @@ piglit_add_executable (polygon-mode-offset polygon-mode-offset.c)
> piglit_add_executable (polygon-mode-facing polygon-mode-facing.c)
> piglit_add_executable (polygon-mode polygon-mode.c)
> piglit_add_executable (polygon-offset polygon-offset.c)
> +piglit_add_executable (polygon-stipple-fs polygon-stipple-fs.c)
> piglit_add_executable (primitive-restart primitive-restart.c)
> piglit_add_executable (primitive-restart-draw-mode primitive-restart-draw-mode.c)
> piglit_add_executable (provoking-vertex provoking-vertex.c)
> diff --git a/tests/general/polygon-stipple-fs.c b/tests/general/polygon-stipple-fs.c
> new file mode 100644
> index 0000000..a9b37cd
> --- /dev/null
> +++ b/tests/general/polygon-stipple-fs.c
> @@ -0,0 +1,166 @@
> +/*
> + * Copyright 2016 Advanced Micro Devices, Inc.
> + *
> + * 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
> + * on the rights to use, copy, modify, merge, publish, distribute, sub
> + * license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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.
> + */
> +
> +/*
> + * Test that polygon stipple works and interacts reasonably with a simple
> + * fragment shader.
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +#define STR(x) #x
> +#define STRINGIFY(x) STR(x)
> +
> +#define TEX_WIDTH 64
> +#define TEX_HEIGHT 64
> +
> +/* Test a window height that is not a multiple of 32! */
> +#define WINDOW_HEIGHT 48
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> + config.supports_gl_compat_version = 30;
> +
> + config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
> +
> + config.window_width = TEX_WIDTH;
> + config.window_height = WINDOW_HEIGHT;
We've had problems on Windows when the Piglit window size is less than
the default (currently 160 pixels). Windows resizes the width of the
window to accommodate the window decorations and that confuses Piglit.
-Brian
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +#define BLUE 0.45
> +#define ALPHA 0.82
> +
> +/* Use a texture, uniforms, and immediate constants. */
> +static const char fragment_shader[] =
> + "uniform sampler2D tex;\n"
> + "uniform float b;\n"
> + "void\n"
> + "main()\n"
> + "{\n"
> + " vec4 color = texture2D(tex, gl_TexCoord[0].xy);\n"
> + " gl_FragColor.xy = color.xy;\n"
> + " gl_FragColor.z = b;\n"
> + " gl_FragColor.w = float(" STRINGIFY(ALPHA) ");\n"
> + "}\n";
> +
> +static GLuint program;
> +
> +static bool
> +test_stipple()
> +{
> + GLuint uniform_tex, uniform_b;
> + float *texture_img;
> + float *expected_img;
> + GLubyte *stipple;
> + GLuint tex;
> + unsigned i, x, y;
> + bool pass = true;
> +
> + glPixelStorei(GL_UNPACK_LSB_FIRST, GL_TRUE);
> +
> + texture_img = malloc(TEX_WIDTH * TEX_HEIGHT * 4 * sizeof(float));
> + expected_img = calloc(TEX_WIDTH * WINDOW_HEIGHT * 4, sizeof(float));
> + stipple = malloc(32 * 32 / 8);
> +
> + i = 0;
> + for (y = 0; y < TEX_HEIGHT; ++y) {
> + for (x = 0; x < TEX_WIDTH; ++x, i += 4) {
> + unsigned bit;
> + bool active;
> +
> + texture_img[i + 0] = (float)rand() / RAND_MAX;
> + texture_img[i + 1] = (float)rand() / RAND_MAX;
> + texture_img[i + 2] = (float)rand() / RAND_MAX;
> + texture_img[i + 3] = (float)rand() / RAND_MAX;
> +
> + if (y >= WINDOW_HEIGHT)
> + continue;
> +
> + bit = (y % 32) * 32 + x % 32;
> +
> + active = stipple[bit / 8] & (1 << (bit % 8));
> + if (active) {
> + expected_img[i + 0] = texture_img[i + 0];
> + expected_img[i + 1] = texture_img[i + 1];
> + expected_img[i + 2] = BLUE;
> + expected_img[i + 3] = ALPHA;
> + }
> + }
> + }
> +
> + glGenTextures(1, &tex);
> + glBindTexture(GL_TEXTURE_2D, tex);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
> + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
> + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TEX_WIDTH, TEX_HEIGHT, 0,
> + GL_RGBA, GL_FLOAT, texture_img);
> +
> + glPolygonStipple(stipple);
> + glEnable(GL_POLYGON_STIPPLE);
> +
> + glUseProgram(program);
> +
> + uniform_tex = glGetUniformLocation(program, "tex");
> + glUniform1i(uniform_tex, 0);
> +
> + uniform_b = glGetUniformLocation(program, "b");
> + glUniform1f(uniform_b, BLUE);
> +
> + piglit_draw_rect_tex(-1.0, -1.0, 2.0, 2.0, 0, 0, 1.0, 1.0 * WINDOW_HEIGHT / TEX_HEIGHT);
> +
> + glUseProgram(0);
> + glDisable(GL_POLYGON_STIPPLE);
> + glDeleteTextures(1, &tex);
> +
> + pass = piglit_probe_image_rgba(0, 0, TEX_WIDTH, WINDOW_HEIGHT, expected_img);
> +
> + free(stipple);
> + free(expected_img);
> + free(texture_img);
> +
> + return pass;
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + bool pass = true;
> +
> + glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
> + glClear(GL_COLOR_BUFFER_BIT);
> +
> + pass = test_stipple();
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> + srand(0); /* reproducibility of the first error */
> +
> + program = piglit_build_simple_program(NULL, fragment_shader);
> +}
>
More information about the Piglit
mailing list