Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
tests/spec/gl-3.1/default-vao.c | 1 +
tests/spec/gl-3.1/draw-buffers-errors.c | 1 +
tests/spec/gl-3.1/enable-vertex-array.c | 16 ++++++++++------
tests/spec/gl-3.1/genned-names.c | 1 +
tests/spec/gl-3.1/glsl-link-empty-prog.c | 2 ++
tests/spec/gl-3.1/minmax.c | 1 +
tests/spec/gl-3.1/mixed-int-float-fbo.c | 1 +
tests/spec/gl-3.1/primitive-restart-xfb.c | 1 +
tests/spec/gl-3.1/vao-broken-attrib.c | 1 +
9 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/tests/spec/gl-3.1/default-vao.c b/tests/spec/gl-3.1/default-vao.c
index 95c7322d9..16cd8e1c4 100644
--- a/tests/spec/gl-3.1/default-vao.c
+++ b/tests/spec/gl-3.1/default-vao.c
@@ -33,6 +33,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
void
diff --git a/tests/spec/gl-3.1/draw-buffers-errors.c
b/tests/spec/gl-3.1/draw-buffers-errors.c
index bab644d75..90e60446c 100644
--- a/tests/spec/gl-3.1/draw-buffers-errors.c
+++ b/tests/spec/gl-3.1/draw-buffers-errors.c
@@ -44,6 +44,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.1/enable-vertex-array.c
b/tests/spec/gl-3.1/enable-vertex-array.c
index dc95c980c..034114bd5 100644
--- a/tests/spec/gl-3.1/enable-vertex-array.c
+++ b/tests/spec/gl-3.1/enable-vertex-array.c
@@ -36,6 +36,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
@@ -133,13 +134,16 @@ piglit_display(void)
glBindVertexArray(triangle_fan_vao);
- // This call should be illegal and raise an error with core profile.
- // If it actually works, it may trigger a failed assertion in Mesa.
- glEnable(GL_VERTEX_ARRAY);
+ if (!piglit_khr_no_error) {
+ // This call should be illegal and raise an error with core
+ // profile. If it actually works, it may trigger a failed
+ // assertion in Mesa.
+ glEnable(GL_VERTEX_ARRAY);
- if (!piglit_check_gl_error(GL_INVALID_ENUM)) {
- printf("Failed to detect invalid glEnable(GL_VERTEX_ARRAY)\n");
- pass = false;
+ if (!piglit_check_gl_error(GL_INVALID_ENUM)) {
+ printf("Failed to detect invalid
glEnable(GL_VERTEX_ARRAY)\n");
+ pass = false;
+ }
}
// This is the correct call to use:
diff --git a/tests/spec/gl-3.1/genned-names.c b/tests/spec/gl-3.1/genned-names.c
index f484997b0..3e04deae1 100644
--- a/tests/spec/gl-3.1/genned-names.c
+++ b/tests/spec/gl-3.1/genned-names.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 0;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.1/glsl-link-empty-prog.c
b/tests/spec/gl-3.1/glsl-link-empty-prog.c
index 1f3f9bb91..7d828e995 100644
--- a/tests/spec/gl-3.1/glsl-link-empty-prog.c
+++ b/tests/spec/gl-3.1/glsl-link-empty-prog.c
@@ -38,6 +38,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
+
PIGLIT_GL_TEST_CONFIG_END
void
diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c
index f1445c206..c07792f1b 100644
--- a/tests/spec/gl-3.1/minmax.c
+++ b/tests/spec/gl-3.1/minmax.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.1/mixed-int-float-fbo.c
b/tests/spec/gl-3.1/mixed-int-float-fbo.c
index 53d8b555b..d2d7aeb65 100644
--- a/tests/spec/gl-3.1/mixed-int-float-fbo.c
+++ b/tests/spec/gl-3.1/mixed-int-float-fbo.c
@@ -36,6 +36,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
static const char *vs_text =
diff --git a/tests/spec/gl-3.1/primitive-restart-xfb.c
b/tests/spec/gl-3.1/primitive-restart-xfb.c
index f9cbe3e52..e700142cb 100644
--- a/tests/spec/gl-3.1/primitive-restart-xfb.c
+++ b/tests/spec/gl-3.1/primitive-restart-xfb.c
@@ -55,6 +55,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.1/vao-broken-attrib.c
b/tests/spec/gl-3.1/vao-broken-attrib.c
index da17cc78e..35b33233d 100644
--- a/tests/spec/gl-3.1/vao-broken-attrib.c
+++ b/tests/spec/gl-3.1/vao-broken-attrib.c
@@ -42,6 +42,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ 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
