[Piglit] [PATCH] ext_packed_depth_stencil: set KHR_no_error compatibility

[Timothy Arceri]

On 28/06/17 00:20, Samuel Pitoiset wrote:

> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>   tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c | 1 +
>   tests/spec/ext_packed_depth_stencil/errors.c                | 8 ++++++--
>   tests/spec/ext_packed_depth_stencil/getteximage.c           | 1 +
>   tests/spec/ext_packed_depth_stencil/readdrawpixels.c        | 1 +
>   tests/spec/ext_packed_depth_stencil/readpixels-24_8.c       | 1 +
>   tests/spec/ext_packed_depth_stencil/texsubimage.c           | 1 +
>   6 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c b/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c
> index 62f461a47..64c1893f6 100644
> --- a/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c
> +++ b/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c
> @@ -53,6 +53,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>   #endif
>   
>   	config.window_visual = PIGLIT_GL_VISUAL_RGBA;
> +	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>   
>   PIGLIT_GL_TEST_CONFIG_END
>   
> diff --git a/tests/spec/ext_packed_depth_stencil/errors.c b/tests/spec/ext_packed_depth_stencil/errors.c
> index 74d40cca8..d1e51c1e1 100644
> --- a/tests/spec/ext_packed_depth_stencil/errors.c
> +++ b/tests/spec/ext_packed_depth_stencil/errors.c
> @@ -33,6 +33,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>   	config.window_visual = (PIGLIT_GL_VISUAL_RGBA |
>   				PIGLIT_GL_VISUAL_DEPTH |
>   				PIGLIT_GL_VISUAL_STENCIL);
> +	config.khr_no_error_support = PIGLIT_NO_ERRORS;
> +
>   PIGLIT_GL_TEST_CONFIG_END
>   
>   
> @@ -93,8 +95,10 @@ piglit_init(int argc, char **argv)
>   
>   	piglit_require_extension("GL_EXT_packed_depth_stencil");
>   
> -	pass = test_drawpixels() && pass;
> -	pass = test_readpixels() && pass;
> +	if (!piglit_khr_no_error) {
> +		pass = test_drawpixels() && pass;
> +		pass = test_readpixels() && pass;
> +	}

I'm not sure the 3rd test belongs here, but it's already there so:

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

>   
>   	/* The EXT_packed_depth_stencil spec says:
>   	 *
> diff --git a/tests/spec/ext_packed_depth_stencil/getteximage.c b/tests/spec/ext_packed_depth_stencil/getteximage.c
> index 2302e6f82..40a12af4c 100644
> --- a/tests/spec/ext_packed_depth_stencil/getteximage.c
> +++ b/tests/spec/ext_packed_depth_stencil/getteximage.c
> @@ -37,6 +37,7 @@
>   PIGLIT_GL_TEST_CONFIG_BEGIN
>   	config.supports_gl_compat_version = 12;
>   	config.window_visual = PIGLIT_GL_VISUAL_RGBA;
> +	config.khr_no_error_support = PIGLIT_NO_ERRORS;
>   PIGLIT_GL_TEST_CONFIG_END
>   
>   
> diff --git a/tests/spec/ext_packed_depth_stencil/readdrawpixels.c b/tests/spec/ext_packed_depth_stencil/readdrawpixels.c
> index 10c8a6182..7be6664c5 100644
> --- a/tests/spec/ext_packed_depth_stencil/readdrawpixels.c
> +++ b/tests/spec/ext_packed_depth_stencil/readdrawpixels.c
> @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>   	config.window_visual = (PIGLIT_GL_VISUAL_RGBA |
>   				PIGLIT_GL_VISUAL_DEPTH |
>   				PIGLIT_GL_VISUAL_STENCIL);
> +	config.khr_no_error_support = PIGLIT_NO_ERRORS;
>   PIGLIT_GL_TEST_CONFIG_END
>   
>   
> diff --git a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c
> index 7fb9ad8ac..db71dba8b 100644
> --- a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c
> +++ b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c
> @@ -37,6 +37,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/ext_packed_depth_stencil/texsubimage.c b/tests/spec/ext_packed_depth_stencil/texsubimage.c
> index 6b9a917ab..999d2e0bc 100644
> --- a/tests/spec/ext_packed_depth_stencil/texsubimage.c
> +++ b/tests/spec/ext_packed_depth_stencil/texsubimage.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>   	config.supports_gl_compat_version = 13;
>   
>   	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> +	config.khr_no_error_support = PIGLIT_NO_ERRORS;
>   
>   PIGLIT_GL_TEST_CONFIG_END
>