Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 .../execution/check-explicit-location.c            |  2 ++
 .../execution/double_attribs.c                     | 22 +++++++++++++---------
 .../execution/getactiveattrib.c                    |  1 +
 .../execution/max-vertex-attrib.c                  |  1 +
 .../execution/overlapping-locations.c              |  1 +
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git 
a/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c 
b/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c
index 509f60bc3..860fc6cdb 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.c
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/check-explicit-location.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
 
 const char *vs_text =
diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c 
b/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c
index afde27001..fc3f9eb57 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/double_attribs.c
@@ -36,6 +36,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 static const char *TestName = "double_attribs";
@@ -217,15 +219,17 @@ test_attrib_array(void)
       }
    }
 
-   for (i = 0; i < ARRAY_SIZE(badTypes); i++) {
-      glVertexAttribLPointer(index, size, badTypes[i], stride, data);
-      err = glGetError();
-      if (err != GL_INVALID_ENUM) {
-         fprintf(stderr,
-                 "%s: glVertexAttribLPointer(type=0x%x) failed to generate "
-                 "GL_INVALID_ENUM\n",
-                 TestName, badTypes[i]);
-         return GL_FALSE;
+   if (!piglit_khr_no_error) {
+      for (i = 0; i < ARRAY_SIZE(badTypes); i++) {
+         glVertexAttribLPointer(index, size, badTypes[i], stride, data);
+         err = glGetError();
+         if (err != GL_INVALID_ENUM) {
+            fprintf(stderr,
+                    "%s: glVertexAttribLPointer(type=0x%x) failed to generate "
+                    "GL_INVALID_ENUM\n",
+                    TestName, badTypes[i]);
+            return GL_FALSE;
+         }
       }
    }
 
diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c 
b/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c
index 4b2241cc5..fd4454a30 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/getactiveattrib.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
        config.supports_gl_core_version = 32;
 
        config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 struct attribute {
diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c 
b/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c
index 8da82388e..bd88227a5 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/max-vertex-attrib.c
@@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
        config.supports_gl_core_version = 32;
 
        config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+       config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 static int test = 0;
diff --git 
a/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c 
b/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c
index 05936f3de..cb367b946 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c
@@ -52,6 +52,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
        config.window_width = 128;
        config.window_height = 128;
        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 bool locations_in_shader;
-- 
2.14.0

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

Reply via email to