[Piglit] [PATCH 1/3] arb_clip_control: set KHR_no_error compatibility

Samuel Pitoiset samuel.pitoiset at gmail.com
Fri Jun 23 14:23:44 UTC 2017


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 .../clip-control-depth-precision.c                 |  1 +
 tests/spec/arb_clip_control/clip-control.c         | 24 ++++++++++++----------
 tests/spec/arb_clip_control/viewport.c             |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/spec/arb_clip_control/clip-control-depth-precision.c b/tests/spec/arb_clip_control/clip-control-depth-precision.c
index 87d928e69..61282a0ad 100644
--- a/tests/spec/arb_clip_control/clip-control-depth-precision.c
+++ b/tests/spec/arb_clip_control/clip-control-depth-precision.c
@@ -60,6 +60,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_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_clip_control/clip-control.c b/tests/spec/arb_clip_control/clip-control.c
index 7b5108b39..020ea0aa2 100644
--- a/tests/spec/arb_clip_control/clip-control.c
+++ b/tests/spec/arb_clip_control/clip-control.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 20;
 
 	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -86,17 +87,18 @@ state_test(void)
 	glClipControl(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE);
 	pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass;
 
-	/* Check bailing out on invalid input */
-	glClipControl(GL_RGB, GL_NEGATIVE_ONE_TO_ONE);
-	pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
-	piglit_reset_gl_error();
-	pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass;
-
-	glClipControl(GL_LOWER_LEFT, GL_RGB);
-	pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
-	piglit_reset_gl_error();
-	pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass;
-
+	if (!piglit_khr_no_error) {
+		/* Check bailing out on invalid input */
+		glClipControl(GL_RGB, GL_NEGATIVE_ONE_TO_ONE);
+		pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+		piglit_reset_gl_error();
+		pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass;
+
+		glClipControl(GL_LOWER_LEFT, GL_RGB);
+		pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+		piglit_reset_gl_error();
+		pass = test_clip_control(GL_UPPER_LEFT, GL_NEGATIVE_ONE_TO_ONE) && pass;
+	}
 
 	/* Check push/pop */
 	glClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE);
diff --git a/tests/spec/arb_clip_control/viewport.c b/tests/spec/arb_clip_control/viewport.c
index 9d41ae94f..763e5c134 100644
--- a/tests/spec/arb_clip_control/viewport.c
+++ b/tests/spec/arb_clip_control/viewport.c
@@ -38,6 +38,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 20;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 
-- 
2.13.1



More information about the Piglit mailing list