[Piglit] [PATCH] arb_bindless_texture: set KHR_no_error compatibility
Timothy Arceri
tarceri at itsqueeze.com
Thu Jun 15 21:34:21 UTC 2017
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
On 10/06/17 00:27, Samuel Pitoiset wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
> tests/spec/arb_bindless_texture/border-color.c | 7 +++++++
> tests/spec/arb_bindless_texture/conversions.c | 1 +
> tests/spec/arb_bindless_texture/errors.c | 1 +
> tests/spec/arb_bindless_texture/handles.c | 16 ++++++++++++++++
> tests/spec/arb_bindless_texture/illegal.c | 1 +
> tests/spec/arb_bindless_texture/legal.c | 1 +
> tests/spec/arb_bindless_texture/limit.c | 1 +
> tests/spec/arb_bindless_texture/uint64_attribs.c | 1 +
> tests/spec/arb_bindless_texture/uniform.c | 13 +++++++++++++
> 9 files changed, 42 insertions(+)
>
> diff --git a/tests/spec/arb_bindless_texture/border-color.c b/tests/spec/arb_bindless_texture/border-color.c
> index 2cd37ade2..da366a19e 100644
> --- a/tests/spec/arb_bindless_texture/border-color.c
> +++ b/tests/spec/arb_bindless_texture/border-color.c
> @@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_compat_version = 33;
> config.supports_gl_core_version = 33;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> @@ -91,6 +92,9 @@ check_invalid_integer_border_colors(void *data)
> GLuint sampler, texture;
> GLint i;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> texture = piglit_integer_texture(GL_RGBA32I, 16, 16, 0, 0);
> sampler = new_sampler();
> glBindTexture(GL_TEXTURE_2D, 0);
> @@ -147,6 +151,9 @@ check_invalid_float_border_colors(void *data)
> GLuint sampler, texture;
> GLint i;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> texture = piglit_rgbw_texture(GL_RGBA32F, 16, 16, GL_FALSE, GL_FALSE,
> GL_UNSIGNED_NORMALIZED);
> sampler = new_sampler();
> diff --git a/tests/spec/arb_bindless_texture/conversions.c b/tests/spec/arb_bindless_texture/conversions.c
> index 4d5f83a6c..7947a73be 100644
> --- a/tests/spec/arb_bindless_texture/conversions.c
> +++ b/tests/spec/arb_bindless_texture/conversions.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_core_version = 33;
> config.supports_gl_compat_version = 33;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_bindless_texture/errors.c b/tests/spec/arb_bindless_texture/errors.c
> index d80ba26d0..fa66c9f2c 100644
> --- a/tests/spec/arb_bindless_texture/errors.c
> +++ b/tests/spec/arb_bindless_texture/errors.c
> @@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_compat_version = 33;
> config.supports_gl_core_version = 33;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_bindless_texture/handles.c b/tests/spec/arb_bindless_texture/handles.c
> index eafb4e569..054fccb03 100644
> --- a/tests/spec/arb_bindless_texture/handles.c
> +++ b/tests/spec/arb_bindless_texture/handles.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_compat_version = 33;
> config.supports_gl_core_version = 33;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> @@ -45,6 +46,9 @@ check_GetTextureHandle_zero_handle(void *data)
> bool pass = true;
> GLuint64 handle;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> /* The ARB_bindless_texture spec says:
> *
> * "If an error occurs, a handle of zero is returned."
> @@ -173,6 +177,9 @@ delete_texture_sampler_while_handle_is_allocated(void *data)
> GLuint texture, sampler;
> GLuint64 handle;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> /* The ARB_bindless_texture spec says:
> *
> * "(5) Is there a way to release a texture or image handle after it
> @@ -222,6 +229,9 @@ delete_texture_sampler_while_handle_is_resident(void *data)
> GLuint64 handle;
> GLboolean ret;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> /* The ARB_bindless_texture_spec says:
> *
> * "(7) What happens if you try to delete a texture or sampler object
> @@ -288,6 +298,9 @@ check_GetImageHandle_zero_handle(void *data)
> if (!piglit_is_extension_supported("GL_ARB_shader_image_load_store"))
> return PIGLIT_SKIP;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> /* The ARB_bindless_texture spec says:
> *
> * "A 64-bit unsigned integer handle is returned if the command
> @@ -411,6 +424,9 @@ delete_texture_while_image_handle_resident(void *data)
> if (!piglit_is_extension_supported("GL_ARB_shader_image_load_store"))
> return PIGLIT_SKIP;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> tex = piglit_rgbw_texture(GL_RGBA32F, 16, 16, GL_TRUE, GL_FALSE,
> GL_UNSIGNED_NORMALIZED);
> glBindTexture(GL_TEXTURE_2D, 0);
> diff --git a/tests/spec/arb_bindless_texture/illegal.c b/tests/spec/arb_bindless_texture/illegal.c
> index ca3449406..de90f0746 100644
> --- a/tests/spec/arb_bindless_texture/illegal.c
> +++ b/tests/spec/arb_bindless_texture/illegal.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_compat_version = 33;
> config.supports_gl_core_version = 33;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_bindless_texture/legal.c b/tests/spec/arb_bindless_texture/legal.c
> index 741cb634c..1043afd5a 100644
> --- a/tests/spec/arb_bindless_texture/legal.c
> +++ b/tests/spec/arb_bindless_texture/legal.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_compat_version = 33;
> config.supports_gl_core_version = 33;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_bindless_texture/limit.c b/tests/spec/arb_bindless_texture/limit.c
> index aadffa175..d27018a3b 100644
> --- a/tests/spec/arb_bindless_texture/limit.c
> +++ b/tests/spec/arb_bindless_texture/limit.c
> @@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.window_width = 300;
> config.window_height = 300;
> config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_bindless_texture/uint64_attribs.c b/tests/spec/arb_bindless_texture/uint64_attribs.c
> index 58046f312..323005dd8 100644
> --- a/tests/spec/arb_bindless_texture/uint64_attribs.c
> +++ b/tests/spec/arb_bindless_texture/uint64_attribs.c
> @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_core_version = 33;
>
> config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_bindless_texture/uniform.c b/tests/spec/arb_bindless_texture/uniform.c
> index 3d7b0ad7c..393b1dab5 100644
> --- a/tests/spec/arb_bindless_texture/uniform.c
> +++ b/tests/spec/arb_bindless_texture/uniform.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> piglit_config = &config;
> config.supports_gl_compat_version = 33;
> config.supports_gl_core_version = 33;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> @@ -131,6 +132,9 @@ check_UniformHandleui64_with_explicit_bound_sampler(void *data)
> GLuint64 handle = 0;
> GLint loc;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> vs = piglit_compile_shader_text(GL_VERTEX_SHADER, passthrough_vs_src);
> fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER,
> fs_explicit_bound_sampler);
> @@ -198,6 +202,9 @@ check_Uniform_with_implicit_bound_sampler(void *data)
> GLuint64 handle = 0;
> GLint loc;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> vs = piglit_compile_shader_text(GL_VERTEX_SHADER, passthrough_vs_src);
> fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER,
> fs_implicit_bound_sampler);
> @@ -240,6 +247,9 @@ check_UniformHandleui64_with_explicit_bound_image(void *data)
> GLuint64 handle = 0;
> GLint loc;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> vs = piglit_compile_shader_text(GL_VERTEX_SHADER, passthrough_vs_src);
> fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER,
> fs_explicit_bound_image);
> @@ -307,6 +317,9 @@ check_Uniform_with_implicit_bound_image(void *data)
> GLuint64 handle = 0;
> GLint loc;
>
> + if (piglit_khr_no_error)
> + return PIGLIT_SKIP;
> +
> vs = piglit_compile_shader_text(GL_VERTEX_SHADER, passthrough_vs_src);
> fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER,
> fs_implicit_bound_image);
>
More information about the Piglit
mailing list