[Piglit] [PATCH 16/50] arb_transform_feedback3: set KHR_no_error status

[Samuel Pitoiset]

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 tests/spec/arb_transform_feedback3/begin_end.c           |  1 +
 .../arb_transform_feedback3/bind_buffer_invalid_index.c  |  1 +
 .../draw_using_invalid_stream_index.c                    |  1 +
 .../arb_transform_feedback3/end_query_with_name_zero.c   |  1 +
 .../arb_transform_feedback3/ext_interleaved_two_bufs.c   |  1 +
 .../arb_transform_feedback3/query_with_invalid_index.c   | 16 +++++++++++-----
 .../spec/arb_transform_feedback3/set_invalid_varyings.c  |  1 +
 .../set_varyings_with_invalid_args.c                     |  1 +
 8 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/tests/spec/arb_transform_feedback3/begin_end.c b/tests/spec/arb_transform_feedback3/begin_end.c
index 8cedf874d..e95c6e657 100644
--- a/tests/spec/arb_transform_feedback3/begin_end.c
+++ b/tests/spec/arb_transform_feedback3/begin_end.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c
index 1e396df1a..fc762a384 100644
--- a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c
+++ b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
index 70e863043..7087c28d2 100644
--- a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
+++ b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c
index 4d405944d..9e19d4f10 100644
--- a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c
+++ b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c
index 89c11bc79..3f724454f 100644
--- a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c
+++ b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c
@@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
index 21972207c..541983094 100644
--- a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
+++ b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -81,8 +82,11 @@ piglit_init(int argc, char **argv)
 		pass = false;
 	}
 
-	glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, max_streams, queries[1]);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+	if (!piglit_khr_no_error) {
+		glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, max_streams,
+				    queries[1]);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+	}
 
 	glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
 			max_streams - 1, queries[2]);
@@ -92,9 +96,11 @@ piglit_init(int argc, char **argv)
 		pass = false;
 	}
 
-	glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
-			max_streams, queries[3]);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+	if (!piglit_khr_no_error) {
+		glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+				    max_streams, queries[3]);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+	}
 
 	glDeleteQueries(ARRAY_SIZE(queries), queries);
 
diff --git a/tests/spec/arb_transform_feedback3/set_invalid_varyings.c b/tests/spec/arb_transform_feedback3/set_invalid_varyings.c
index aa3e55bc9..ee4b596a6 100644
--- a/tests/spec/arb_transform_feedback3/set_invalid_varyings.c
+++ b/tests/spec/arb_transform_feedback3/set_invalid_varyings.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c b/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c
index a353a7cbd..a9efccb19 100644
--- a/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c
+++ b/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c
@@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
 	config.supports_gl_compat_version = 32;
 	config.supports_gl_core_version = 32;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
-- 
2.14.0