[Piglit] [PATCH] glx: add test for drawing to GL_FRONT between glxMakeCurrent()

[Brian Paul]

On 04/27/2017 07:02 AM, Józef Kucia wrote:
> Based on the glx-fbo-binding test.
>
> Signed-off-by: Józef Kucia <joseph.kucia at gmail.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99116
> ---
>   tests/all.py                        |   1 +
>   tests/glx/CMakeLists.gl.txt         |   1 +
>   tests/glx/glx-multi-context-front.c | 114 ++++++++++++++++++++++++++++++++++++
>   3 files changed, 116 insertions(+)
>   create mode 100644 tests/glx/glx-multi-context-front.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 3cd3b47..6255ddf 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -662,6 +662,7 @@ with profile.test_list.group_manager(
>       g(['glx-fbconfig-compliance'], run_concurrent=False)
>       g(['glx-fbconfig-bad'], run_concurrent=False)
>       g(['glx-fbo-binding'], run_concurrent=False)
> +    g(['glx-multi-context-front'], run_concurrent=False)
>       g(['glx-multi-context-ib-1'], run_concurrent=False)
>       g(['glx-multithread'], run_concurrent=False)
>       g(['glx-multithread-texture'], run_concurrent=False)
> diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
> index ec5fc73..1e1c684 100644
> --- a/tests/glx/CMakeLists.gl.txt
> +++ b/tests/glx/CMakeLists.gl.txt
> @@ -30,6 +30,7 @@ IF(PIGLIT_BUILD_GLX_TESTS)
>   	piglit_add_executable (glx-destroycontext-1 glx-destroycontext-1.c)
>   	piglit_add_executable (glx-destroycontext-2 glx-destroycontext-2.c)
>   	piglit_add_executable (glx-dont-care-mask glx-dont-care-mask.c)
> +	piglit_add_executable (glx-multi-context-front glx-multi-context-front.c)
>   	piglit_add_executable (glx-multi-context-ib-1 glx-multi-context-ib-1.c)
>   	piglit_add_executable (glx-multithread glx-multithread.c)
>   	target_link_libraries(glx-multithread pthread)
> diff --git a/tests/glx/glx-multi-context-front.c b/tests/glx/glx-multi-context-front.c
> new file mode 100644
> index 0000000..74cd48b
> --- /dev/null
> +++ b/tests/glx/glx-multi-context-front.c
> @@ -0,0 +1,114 @@
> +/*
> + * Copyright (c) 2011 VMware, Inc.
> + * Copyright (c) 2017 Józef Kucia <joseph.kucia at gmail.com>
> + *
> + * 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.
> + */
> +
> +/**
> + * Test clearing GL_FRONT across glXMakeCurrent calls.
> + *
> + * Reproduces bug in st/mesa front buffer allocation logic.
> + */
> +
> +#include "piglit-util-gl.h"
> +#include "piglit-glx-util.h"
> +
> +int piglit_width = 50, piglit_height = 50;

I don't think you need to declare the window size here.

> +static const char *test_name = "glx-multi-context-front";
> +static const float green[4] = { 0.0f, 1.0f, 0.0f, 0.0f };
> +
> +static Window Windows[2];
> +static GLXContext ctx;
> +
> +
> +enum piglit_result
> +draw(Display *dpy)
> +{
> +	bool pass = true;
> +	GLint buffer;
> +
> +	glXMakeCurrent(dpy, Windows[0], ctx);
> +
> +	glXMakeCurrent(dpy, Windows[1], ctx);
> +	glDrawBuffer(GL_FRONT);
> +
> +	glXMakeCurrent(dpy, Windows[0], ctx);
> +	glGetIntegerv(GL_DRAW_BUFFER, &buffer);
> +	if (buffer != GL_FRONT) {
> +		printf("%s: Got unexpected draw buffer %#x\n",
> +		       test_name, buffer);

You can use piglit_get_gl_enum_name() here and below to print the enum 
string in the error message.


> +		pass = false;
> +	}
> +	glXMakeCurrent(dpy, Windows[1], ctx);
> +	glGetIntegerv(GL_DRAW_BUFFER, &buffer);
> +	if (buffer != GL_FRONT) {
> +		printf("%s: Got unexpected draw buffer %#x\n",
> +		       test_name, buffer);
> +		pass = false;
> +	}
> +
> +	glClearColor(green[0], green[1], green[2], green[3]);
> +	glClear(GL_COLOR_BUFFER_BIT);
> +
> +	glReadBuffer(GL_FRONT);
> +	pass &= piglit_probe_rect_rgb(0, 0, piglit_width, piglit_height,
> +				      green);
> +
> +	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +
> +int
> +main(int argc, char **argv)
> +{
> +	Display *dpy;
> +	XVisualInfo *visinfo;
> +	int i;
> +
> +	for (i = 1; i < argc; i++) {
> +		if (strcmp(argv[i], "-auto") == 0) {
> +			piglit_automatic = 1;
> +			break;
> +		}
> +	}
> +
> +	dpy = XOpenDisplay(NULL);
> +	if (!dpy) {
> +		fprintf(stderr, "Failed to open display\n");
> +		piglit_report_result(PIGLIT_FAIL);
> +	}
> +
> +	visinfo = piglit_get_glx_visual(dpy);
> +	Windows[0] = piglit_get_glx_window(dpy, visinfo);
> +	Windows[1] = piglit_get_glx_window(dpy, visinfo);
> +
> +	XMapWindow(dpy, Windows[0]);
> +	XMapWindow(dpy, Windows[1]);
> +
> +	ctx = piglit_get_glx_context(dpy, visinfo);
> +
> +	glXMakeCurrent(dpy, Windows[0], ctx);
> +	piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
> +
> +	piglit_glx_event_loop(dpy, draw);
> +
> +	return 0;
> +}
>

Looks good otherwise.  I think I see the problem in Mesa.  I'll try to 
fix it in the coming days.

-Brian