Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 tests/spec/arb_transform_feedback2/api-queries.c           |  1 +
 .../spec/arb_transform_feedback2/cannot-bind-when-active.c | 13 +++++++++----
 .../arb_transform_feedback2/change-objects-while-paused.c  |  1 +
 tests/spec/arb_transform_feedback2/gen-names-only.c        | 14 ++++++++++----
 tests/spec/arb_transform_feedback2/istransformfeedback.c   |  1 +
 tests/spec/arb_transform_feedback2/pause-counting.c        |  1 +
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/tests/spec/arb_transform_feedback2/api-queries.c 
b/tests/spec/arb_transform_feedback2/api-queries.c
index 61be114b6..c7cf6585d 100644
--- a/tests/spec/arb_transform_feedback2/api-queries.c
+++ b/tests/spec/arb_transform_feedback2/api-queries.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        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_transform_feedback2/cannot-bind-when-active.c 
b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
index c4ef636b0..754b48dac 100644
--- a/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
+++ b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        config.window_visual = PIGLIT_GL_VISUAL_RGB;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -101,8 +102,10 @@ void piglit_init(int argc, char **argv)
 
        pass = piglit_check_gl_error(0) && pass;
 
-       glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]);
-       pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       if (!piglit_khr_no_error) {
+               glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[1]);
+               pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       }
 
        /* Make the transform feedback object inactive by calling
         * EndTransformFeedback.  Then try (again) to bind the other object.
@@ -130,8 +133,10 @@ void piglit_init(int argc, char **argv)
        glResumeTransformFeedback();
        pass = piglit_check_gl_error(0) && pass;
 
-       glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]);
-       pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       if (!piglit_khr_no_error) {
+               glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, ids[0]);
+               pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       }
 
        /* Make the second object non-active, and restore the default object.
         * This should work.
diff --git a/tests/spec/arb_transform_feedback2/change-objects-while-paused.c 
b/tests/spec/arb_transform_feedback2/change-objects-while-paused.c
index 448ec7359..b81fbd87a 100644
--- a/tests/spec/arb_transform_feedback2/change-objects-while-paused.c
+++ b/tests/spec/arb_transform_feedback2/change-objects-while-paused.c
@@ -50,6 +50,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 #error "Cannot build this."
 #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_transform_feedback2/gen-names-only.c 
b/tests/spec/arb_transform_feedback2/gen-names-only.c
index cacac8ea8..9c7b67b6e 100644
--- a/tests/spec/arb_transform_feedback2/gen-names-only.c
+++ b/tests/spec/arb_transform_feedback2/gen-names-only.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        config.window_visual = PIGLIT_GL_VISUAL_RGB;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -60,15 +61,20 @@ void piglit_init(int argc, char **argv)
        glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
        pass = piglit_check_gl_error(0) && pass;
 
-       glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id + 1);
-       pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       if (!piglit_khr_no_error) {
+               glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id + 1);
+               pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       }
 
        glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
        pass = piglit_check_gl_error(0) && pass;
 
        glDeleteTransformFeedbacks(1, &id);
-       glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
-       pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+
+       if (!piglit_khr_no_error) {
+               glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, id);
+               pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+       }
 
        piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/spec/arb_transform_feedback2/istransformfeedback.c 
b/tests/spec/arb_transform_feedback2/istransformfeedback.c
index cb4d670f8..c1d8c217e 100644
--- a/tests/spec/arb_transform_feedback2/istransformfeedback.c
+++ b/tests/spec/arb_transform_feedback2/istransformfeedback.c
@@ -50,6 +50,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_transform_feedback2/pause-counting.c 
b/tests/spec/arb_transform_feedback2/pause-counting.c
index 9873ae3c1..947cc7412 100644
--- a/tests/spec/arb_transform_feedback2/pause-counting.c
+++ b/tests/spec/arb_transform_feedback2/pause-counting.c
@@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        config.window_visual = PIGLIT_GL_VISUAL_RGB;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
-- 
2.14.0

_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to