Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c   | 2 ++
 tests/spec/arb_shader_objects/clear-with-deleted.c                | 8 ++++++--
 tests/spec/arb_shader_objects/delete-repeat.c                     | 8 ++++++--
 tests/spec/arb_shader_objects/getactiveuniform-beginend.c         | 2 ++
 tests/spec/arb_shader_objects/getuniform.c                        | 2 ++
 .../getuniformlocation-array-of-struct-of-array.c                 | 2 ++
 6 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c 
b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c
index 937a37c26..8ff42bf98 100644
--- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c
+++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c
@@ -39,6 +39,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 static const GLchar *vertShaderText =
diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c 
b/tests/spec/arb_shader_objects/clear-with-deleted.c
index 0b8875370..4e3949638 100644
--- a/tests/spec/arb_shader_objects/clear-with-deleted.c
+++ b/tests/spec/arb_shader_objects/clear-with-deleted.c
@@ -38,6 +38,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 static const char *vs_source =
@@ -111,8 +113,10 @@ piglit_display(void)
        /* Now, disable the program and it should be finally deleted. */
        glUseProgram(0);
 
-       glGetProgramiv(prog, GL_DELETE_STATUS, &status);
-       pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+       if (!piglit_khr_no_error) {
+               glGetProgramiv(prog, GL_DELETE_STATUS, &status);
+               pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+       }
 
        piglit_present_results();
 
diff --git a/tests/spec/arb_shader_objects/delete-repeat.c 
b/tests/spec/arb_shader_objects/delete-repeat.c
index a72c35363..b80994588 100644
--- a/tests/spec/arb_shader_objects/delete-repeat.c
+++ b/tests/spec/arb_shader_objects/delete-repeat.c
@@ -35,6 +35,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 static const char *vs_source =
@@ -90,8 +92,10 @@ piglit_display(void)
        /* Now, disable the program and it should be finally deleted. */
        glUseProgram(0);
 
-       glGetProgramiv(prog, GL_DELETE_STATUS, &status);
-       pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+       if (!piglit_khr_no_error) {
+               glGetProgramiv(prog, GL_DELETE_STATUS, &status);
+               pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+       }
 
        piglit_present_results();
 
diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c 
b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c
index 7390b991d..1efd435db 100644
--- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c
+++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c
@@ -38,6 +38,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
 
+       config.khr_no_error_support = PIGLIT_HAS_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 enum piglit_result
diff --git a/tests/spec/arb_shader_objects/getuniform.c 
b/tests/spec/arb_shader_objects/getuniform.c
index d2a7d23f3..1596a935b 100644
--- a/tests/spec/arb_shader_objects/getuniform.c
+++ b/tests/spec/arb_shader_objects/getuniform.c
@@ -34,6 +34,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 enum piglit_result
diff --git 
a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c 
b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c
index e3e5cc552..b395c8714 100644
--- 
a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c
+++ 
b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c
@@ -37,6 +37,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 static const char *vs_code =
-- 
2.14.0

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

Reply via email to