[Piglit] [PATCH 1/2] Remove tests/shaders/link-mismatch-layout-0[13]

Ian Romanick idr at freedesktop.org
Thu Jul 10 10:30:02 PDT 2014 

Series is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 07/06/2014 03:01 AM, Chris Forbes wrote:
> These date back to a time before shader_runner was capable of testing
> this case. Now redundant.
> 
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> ---
>  tests/all.py                            |  2 -
>  tests/shaders/CMakeLists.gl.txt         |  2 -
>  tests/shaders/link-mismatch-layout-01.c | 96 ---------------------------------
>  tests/shaders/link-mismatch-layout-03.c | 94 --------------------------------
>  4 files changed, 194 deletions(-)
>  delete mode 100644 tests/shaders/link-mismatch-layout-01.c
>  delete mode 100644 tests/shaders/link-mismatch-layout-03.c
> 
> diff --git a/tests/all.py b/tests/all.py
> index 7ce90d8..7ba056f 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -534,9 +534,7 @@ add_concurrent_test(shaders, 'glsl-max-vertex-attrib')
>  add_concurrent_test(shaders, 'glsl-kwin-blur-1')
>  add_concurrent_test(shaders, 'glsl-kwin-blur-2')
>  add_concurrent_test(shaders, 'gpu_shader4_attribs')
> -add_concurrent_test(shaders, 'link-mismatch-layout-01')
>  add_concurrent_test(shaders, 'link-mismatch-layout-02')
> -add_concurrent_test(shaders, 'link-mismatch-layout-03')
>  add_concurrent_test(shaders, 'link-unresolved-function')
>  add_concurrent_test(shaders, 'sso-simple')
>  add_concurrent_test(shaders, 'sso-uniforms-01')
> diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
> index e82c34c..11db820 100644
> --- a/tests/shaders/CMakeLists.gl.txt
> +++ b/tests/shaders/CMakeLists.gl.txt
> @@ -154,9 +154,7 @@ IF (UNIX)
>  ENDIF (UNIX)
>  piglit_add_executable (glsl-kwin-blur-1 glsl-kwin-blur-1.c)
>  piglit_add_executable (glsl-kwin-blur-2 glsl-kwin-blur-2.c)
> -piglit_add_executable (link-mismatch-layout-01 link-mismatch-layout-01.c)
>  piglit_add_executable (link-mismatch-layout-02 link-mismatch-layout-02.c)
> -piglit_add_executable (link-mismatch-layout-03 link-mismatch-layout-03.c)
>  piglit_add_executable (link-unresolved-function link-unresolved-function.c)
>  piglit_add_executable (sso-simple sso-simple.c)
>  piglit_add_executable (sso-uniforms-01 sso-uniforms-01.c)
> diff --git a/tests/shaders/link-mismatch-layout-01.c b/tests/shaders/link-mismatch-layout-01.c
> deleted file mode 100644
> index 3f8d781..0000000
> --- a/tests/shaders/link-mismatch-layout-01.c
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -/*
> - * Copyright © 2010 Intel Corporation
> - *
> - * 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.
> - */
> -
> -/**
> - * \file link-mismatch-layout-01.c
> - * Verify that linking fails mismatching layout qualifiers are used
> - *
> - * Attmpt to link two fragment shaders.  One shader specifies
> - * \c pixel_center_interger layout of \c gl_FragCoord, and the other specifies
> - * \c origin_upper_left.  Linking should fail.
> - *
> - * \author Ian Romanick <ian.d.romanick at intel.com>
> - */
> -#include "piglit-util-gl-common.h"
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> -
> -	config.supports_gl_compat_version = 10;
> -
> -	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> -
> -PIGLIT_GL_TEST_CONFIG_END
> -
> -static const char layout_center[] =
> -	"#extension GL_ARB_fragment_coord_conventions: enable\n"
> -	"layout(pixel_center_integer) varying vec4 gl_FragCoord;\n"
> -	"vec4 foo(void);\n"
> -	"void main(void)\n"
> -	"{\n"
> -	"    gl_FragColor = foo();\n"
> -	"}\n";
> -
> -static const char layout_upper[] =
> -	"#extension GL_ARB_fragment_coord_conventions: enable\n"
> -	"layout(origin_upper_left) varying vec4 gl_FragCoord;\n"
> -	"vec4 foo(void)\n"
> -	"{\n"
> -	"    return vec4(1.0);\n"
> -	"}\n";
> -
> -enum piglit_result
> -piglit_display(void)
> -{
> -	return PIGLIT_FAIL;
> -}
> -
> -void
> -piglit_init(int argc, char **argv)
> -{
> -	GLint ok;
> -	GLuint prog;
> -	GLuint fs[2];
> -
> -	piglit_require_gl_version(20);
> -
> -	piglit_require_extension("GL_ARB_fragment_coord_conventions");
> -
> -	fs[0] = piglit_compile_shader_text(GL_FRAGMENT_SHADER, layout_center);
> -	fs[1] = piglit_compile_shader_text(GL_FRAGMENT_SHADER, layout_upper);
> -	prog = glCreateProgram();
> -	glAttachShader(prog, fs[0]);
> -	glAttachShader(prog, fs[1]);
> -	glLinkProgram(prog);
> -	glDeleteShader(fs[0]);
> -	glDeleteShader(fs[1]);
> -
> -	ok = piglit_link_check_status_quiet(prog);
> -	if (ok) {
> -		fprintf(stderr,
> -			"Linking with mismatched gl_FragCoord layouts "
> -			"succeeded when it should have failed.\n");
> -		piglit_report_result(PIGLIT_FAIL);
> -	}
> -
> -	piglit_report_result(PIGLIT_PASS);
> -}
> diff --git a/tests/shaders/link-mismatch-layout-03.c b/tests/shaders/link-mismatch-layout-03.c
> deleted file mode 100644
> index 1e9c93a..0000000
> --- a/tests/shaders/link-mismatch-layout-03.c
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -/*
> - * Copyright © 2010 Intel Corporation
> - *
> - * 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.
> - */
> -
> -/**
> - * \file link-mismatch-layout-03.c
> - * Verify that linking passes when layout qualifiers are used
> - *
> - * Attmpt to link two fragment shaders.  One shader specifies
> - * \c pixel_center_interger layout of \c gl_FragCoord, and the other does not
> - * specify a layout qualifier for \c gl_FragCoord.  Linking should succeed.
> - *
> - * \author Ian Romanick <ian.d.romanick at intel.com>
> - */
> -#include "piglit-util-gl-common.h"
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> -
> -	config.supports_gl_compat_version = 10;
> -
> -	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> -
> -PIGLIT_GL_TEST_CONFIG_END
> -
> -static const char layout_center[] =
> -	"#extension GL_ARB_fragment_coord_conventions: enable\n"
> -	"layout(pixel_center_integer) varying vec4 gl_FragCoord;\n"
> -	"vec4 foo(void);\n"
> -	"void main(void)\n"
> -	"{\n"
> -	"    gl_FragColor = foo();\n"
> -	"}\n";
> -
> -static const char layout_upper[] =
> -	"vec4 foo(void)\n"
> -	"{\n"
> -	"    return vec4(1.0);\n"
> -	"}\n";
> -
> -enum piglit_result
> -piglit_display(void)
> -{
> -	return PIGLIT_FAIL;
> -}
> -
> -void
> -piglit_init(int argc, char **argv)
> -{
> -	GLint ok;
> -	GLuint prog;
> -	GLuint fs[2];
> -
> -	piglit_require_gl_version(20);
> -
> -	piglit_require_extension("GL_ARB_fragment_coord_conventions");
> -
> -	fs[0] = piglit_compile_shader_text(GL_FRAGMENT_SHADER, layout_center);
> -	fs[1] = piglit_compile_shader_text(GL_FRAGMENT_SHADER, layout_upper);
> -	prog = glCreateProgram();
> -	glAttachShader(prog, fs[0]);
> -	glAttachShader(prog, fs[1]);
> -	glLinkProgram(prog);
> -	glDeleteShader(fs[0]);
> -	glDeleteShader(fs[1]);
> -
> -	ok = piglit_link_check_status(prog);
> -	if (!ok) {
> -		fprintf(stderr,
> -			"Linking with gl_FragCoord layouts "
> -			"failed when it should have succeeded.\n");
> -		piglit_report_result(PIGLIT_FAIL);
> -	}
> -
> -	piglit_report_result(PIGLIT_PASS);
> -}
>

More information about the Piglit mailing list