[Piglit] [PATCH] ARB_blend_func_extended: set KHR_no_error status
Samuel Pitoiset
samuel.pitoiset at gmail.com
Thu Jun 29 21:03:26 UTC 2017
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
On 06/29/2017 08:24 AM, Timothy Arceri wrote:
> ---
> .../api/bindfragdataindexed-invalid-parameters.c | 1 +
> tests/spec/arb_blend_func_extended/api/blend-api.c | 1 +
> tests/spec/arb_blend_func_extended/api/builtins.c | 1 +
> .../spec/arb_blend_func_extended/api/error-at-begin.c | 1 +
> .../arb_blend_func_extended/api/getfragdataindex.c | 19 +++++++++++--------
> .../arb_blend_func_extended/api/output-location.c | 1 +
> .../execution/fbo-extended-blend-explicit.c | 1 +
> .../execution/fbo-extended-blend-pattern.c | 1 +
> .../execution/fbo-extended-blend.c | 1 +
> 9 files changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c
> index c4a8d53..27ae062 100644
> --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c
> +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c
> @@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 30;
> #endif
> config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-api.c
> index 4c34bc7..9160862 100644
> --- a/tests/spec/arb_blend_func_extended/api/blend-api.c
> +++ b/tests/spec/arb_blend_func_extended/api/blend-api.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 20;
> #endif
> 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_blend_func_extended/api/builtins.c b/tests/spec/arb_blend_func_extended/api/builtins.c
> index 7525244..f4eac95 100644
> --- a/tests/spec/arb_blend_func_extended/api/builtins.c
> +++ b/tests/spec/arb_blend_func_extended/api/builtins.c
> @@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_es_version = 20;
> 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_blend_func_extended/api/error-at-begin.c b/tests/spec/arb_blend_func_extended/api/error-at-begin.c
> index da09501..7acf333 100644
> --- a/tests/spec/arb_blend_func_extended/api/error-at-begin.c
> +++ b/tests/spec/arb_blend_func_extended/api/error-at-begin.c
> @@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>
> config.supports_gl_compat_version = 10;
> config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> + config.khr_no_error_support = PIGLIT_HAS_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c
> index a30263e..3c0efd0 100644
> --- a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c
> +++ b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 30;
> #endif
> config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> @@ -132,18 +133,20 @@ void piglit_init(int argc, char **argv)
> * OPERATION is generated. If name is not a varying out variable,
> * or if an error occurs, -1 will be returned."
> */
> - printf("Querying index before linking...\n");
> + if (!piglit_khr_no_error) {
> + printf("Querying index before linking...\n");
> #ifdef PIGLIT_USE_OPENGL
> - idx = glGetFragDataIndex(prog, "v");
> + idx = glGetFragDataIndex(prog, "v");
> #else // PIGLIT_USE_OPENGLES3
> - idx = glGetFragDataIndexEXT(prog, "v");
> + idx = glGetFragDataIndexEXT(prog, "v");
> #endif
> - if (!piglit_check_gl_error(GL_INVALID_OPERATION))
> - piglit_report_result(PIGLIT_FAIL);
> + if (!piglit_check_gl_error(GL_INVALID_OPERATION))
> + piglit_report_result(PIGLIT_FAIL);
>
> - if (idx != -1) {
> - fprintf(stderr, "Expected index = -1, got %d\n", idx);
> - piglit_report_result(PIGLIT_FAIL);
> + if (idx != -1) {
> + fprintf(stderr, "Expected index = -1, got %d\n", idx);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> }
>
> glLinkProgram(prog);
> diff --git a/tests/spec/arb_blend_func_extended/api/output-location.c b/tests/spec/arb_blend_func_extended/api/output-location.c
> index 4d01818..dbda66f 100644
> --- a/tests/spec/arb_blend_func_extended/api/output-location.c
> +++ b/tests/spec/arb_blend_func_extended/api/output-location.c
> @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 30;
> #endif
> 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_blend_func_extended/execution/fbo-extended-blend-explicit.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c
> index ce3f7e4..1428b3d 100644
> --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c
> +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c
> @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 30;
> #endif
> config.window_visual = PIGLIT_GL_VISUAL_RGB;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-pattern.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-pattern.c
> index 129fe63..94c7791 100644
> --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-pattern.c
> +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-pattern.c
> @@ -56,6 +56,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 20;
> #endif
> config.window_visual = PIGLIT_GL_VISUAL_RGB;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
> diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c
> index 0902a4b..2143a43 100644
> --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c
> +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c
> @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
> config.supports_gl_es_version = 30;
> #endif
> config.window_visual = PIGLIT_GL_VISUAL_RGB;
> + config.khr_no_error_support = PIGLIT_NO_ERRORS;
>
> PIGLIT_GL_TEST_CONFIG_END
>
>
More information about the Piglit
mailing list