[Piglit] [PATCH] arb_texture_buffer_object: set KHR_no_error support
Samuel Pitoiset
samuel.pitoiset at gmail.com
Thu Jul 6 16:10:15 UTC 2017
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
On 07/06/2017 06:41 AM, Timothy Arceri wrote:
> Here we also move some of the config setup to the top of the
> file as this is the layout of piglit tests everywhere else in
> piglit.
> ---
> tests/spec/arb_texture_buffer_object/bufferstorage.c | 11 ++++++-----
> tests/spec/arb_texture_buffer_object/data-sync.c | 1 +
> tests/spec/arb_texture_buffer_object/dlist.c | 1 +
> tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c | 13 +++++++------
> tests/spec/arb_texture_buffer_object/formats.c | 1 +
> tests/spec/arb_texture_buffer_object/get.c | 1 +
> tests/spec/arb_texture_buffer_object/max-size.c | 11 ++++++-----
> tests/spec/arb_texture_buffer_object/minmax.c | 1 +
> tests/spec/arb_texture_buffer_object/negative-bad-bo.c | 1 +
> tests/spec/arb_texture_buffer_object/negative-bad-format.c | 1 +
> tests/spec/arb_texture_buffer_object/negative-bad-target.c | 1 +
> tests/spec/arb_texture_buffer_object/negative-unsupported.c | 1 +
> tests/spec/arb_texture_buffer_object/render-no-bo.c | 13 +++++++------
> tests/spec/arb_texture_buffer_object/subdata-sync.c | 1 +
> tests/spec/arb_texture_buffer_object/unused-name.c | 1 +
> 15 files changed, 37 insertions(+), 22 deletions(-)
>
> diff --git a/tests/spec/arb_texture_buffer_object/bufferstorage.c b/tests/spec/arb_texture_buffer_object/bufferstorage.c
> index c46c70d..16e4dcd 100644
> --- a/tests/spec/arb_texture_buffer_object/bufferstorage.c
> +++ b/tests/spec/arb_texture_buffer_object/bufferstorage.c
> @@ -27,6 +27,12 @@
>
> #include "piglit-util-gl.h"
>
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> + config.supports_gl_core_version = 31;
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> static const float green[4] = {0, 1, 0, 0};
> static const float red[4] = {1, 0, 0, 0};
> static float *map;
> @@ -138,8 +144,3 @@ piglit_init(int argc, char **argv)
> GL_FALSE, 0, NULL);
> glEnableVertexAttribArray(vertex_location);
> }
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> - config.supports_gl_core_version = 31;
> - config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> -PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/arb_texture_buffer_object/data-sync.c b/tests/spec/arb_texture_buffer_object/data-sync.c
> index 5542734..511690d 100644
> --- a/tests/spec/arb_texture_buffer_object/data-sync.c
> +++ b/tests/spec/arb_texture_buffer_object/data-sync.c
> @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> PIGLIT_GL_TEST_CONFIG_END
>
> enum piglit_result
> diff --git a/tests/spec/arb_texture_buffer_object/dlist.c b/tests/spec/arb_texture_buffer_object/dlist.c
> index ea15f61..565dc24 100644
> --- a/tests/spec/arb_texture_buffer_object/dlist.c
> +++ b/tests/spec/arb_texture_buffer_object/dlist.c
> @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_compat_version = 10;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
> index c9aa6c4..c0e3976 100644
> --- a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
> +++ b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c
> @@ -39,6 +39,13 @@
>
> #include "piglit-util-gl.h"
>
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> + config.supports_gl_compat_version = 10;
> + config.supports_gl_core_version = 31;
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> enum piglit_result
> piglit_display(void)
> {
> @@ -113,9 +120,3 @@ piglit_init(int argc, char **argv)
> if (piglit_get_gl_version() < 31)
> piglit_require_extension("GL_ARB_texture_buffer_object");
> }
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> - config.supports_gl_compat_version = 10;
> - config.supports_gl_core_version = 31;
> - config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> -PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c
> index fad657d..f2960cd 100644
> --- a/tests/spec/arb_texture_buffer_object/formats.c
> +++ b/tests/spec/arb_texture_buffer_object/formats.c
> @@ -719,4 +719,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.window_width = 200;
> config.window_height = 500;
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/arb_texture_buffer_object/get.c b/tests/spec/arb_texture_buffer_object/get.c
> index 68d492d..3d16635 100644
> --- a/tests/spec/arb_texture_buffer_object/get.c
> +++ b/tests/spec/arb_texture_buffer_object/get.c
> @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/max-size.c b/tests/spec/arb_texture_buffer_object/max-size.c
> index 6507b80..19f4ddf 100644
> --- a/tests/spec/arb_texture_buffer_object/max-size.c
> +++ b/tests/spec/arb_texture_buffer_object/max-size.c
> @@ -27,6 +27,12 @@
>
> #include "piglit-util-gl.h"
>
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> + config.supports_gl_core_version = 31;
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> enum piglit_result
> piglit_display(void)
> {
> @@ -100,8 +106,3 @@ piglit_init(int argc, char **argv)
>
> glUniform1i(glGetUniformLocation(prog, "offset"), max - 1);
> }
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> - config.supports_gl_core_version = 31;
> - config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> -PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/arb_texture_buffer_object/minmax.c b/tests/spec/arb_texture_buffer_object/minmax.c
> index 98b80d6..6e7ffda 100644
> --- a/tests/spec/arb_texture_buffer_object/minmax.c
> +++ b/tests/spec/arb_texture_buffer_object/minmax.c
> @@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c
> index a5f470f..8b2de53 100644
> --- a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c
> +++ b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-format.c b/tests/spec/arb_texture_buffer_object/negative-bad-format.c
> index 60b7b08..269eabe 100644
> --- a/tests/spec/arb_texture_buffer_object/negative-bad-format.c
> +++ b/tests/spec/arb_texture_buffer_object/negative-bad-format.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-target.c b/tests/spec/arb_texture_buffer_object/negative-bad-target.c
> index 25f626b..e952ba3 100644
> --- a/tests/spec/arb_texture_buffer_object/negative-bad-target.c
> +++ b/tests/spec/arb_texture_buffer_object/negative-bad-target.c
> @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/negative-unsupported.c b/tests/spec/arb_texture_buffer_object/negative-unsupported.c
> index b71a62e..8d391eb 100644
> --- a/tests/spec/arb_texture_buffer_object/negative-unsupported.c
> +++ b/tests/spec/arb_texture_buffer_object/negative-unsupported.c
> @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_compat_version = 10;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_texture_buffer_object/render-no-bo.c b/tests/spec/arb_texture_buffer_object/render-no-bo.c
> index 92e8f3e..202c781 100644
> --- a/tests/spec/arb_texture_buffer_object/render-no-bo.c
> +++ b/tests/spec/arb_texture_buffer_object/render-no-bo.c
> @@ -37,6 +37,13 @@
>
> #include "piglit-util-gl.h"
>
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> + config.supports_gl_compat_version = 10;
> + config.supports_gl_core_version = 31;
> + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +PIGLIT_GL_TEST_CONFIG_END
> +
> enum piglit_result
> piglit_display(void)
> {
> @@ -113,9 +120,3 @@ piglit_init(int argc, char **argv)
> if (piglit_get_gl_version() < 31)
> piglit_require_extension("GL_ARB_texture_buffer_object");
> }
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> - config.supports_gl_compat_version = 10;
> - config.supports_gl_core_version = 31;
> - config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> -PIGLIT_GL_TEST_CONFIG_END
> diff --git a/tests/spec/arb_texture_buffer_object/subdata-sync.c b/tests/spec/arb_texture_buffer_object/subdata-sync.c
> index 8b1592b..636d8fc 100644
> --- a/tests/spec/arb_texture_buffer_object/subdata-sync.c
> +++ b/tests/spec/arb_texture_buffer_object/subdata-sync.c
> @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 31;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
> PIGLIT_GL_TEST_CONFIG_END
>
> enum piglit_result
> diff --git a/tests/spec/arb_texture_buffer_object/unused-name.c b/tests/spec/arb_texture_buffer_object/unused-name.c
> index b1f5166..23938d1 100644
> --- a/tests/spec/arb_texture_buffer_object/unused-name.c
> +++ b/tests/spec/arb_texture_buffer_object/unused-name.c
> @@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_compat_version = 10;
>
> config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
>
More information about the Piglit
mailing list