[Piglit] [PATCH 34/50] arb_occlusion_query: set KHR_no_error status

[Samuel Pitoiset]

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 .../spec/arb_occlusion_query/gen_delete_while_active.c | 18 +++++++++++-------
 tests/spec/arb_occlusion_query/occlusion_query.c       |  1 +
 .../spec/arb_occlusion_query/occlusion_query_conform.c |  2 ++
 .../occlusion_query_meta_no_fragments.c                |  1 +
 .../arb_occlusion_query/occlusion_query_meta_save.c    |  1 +
 tests/spec/arb_occlusion_query/occlusion_query_order.c |  1 +
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/tests/spec/arb_occlusion_query/gen_delete_while_active.c 
b/tests/spec/arb_occlusion_query/gen_delete_while_active.c
index fcf98933e..df3709162 100644
--- a/tests/spec/arb_occlusion_query/gen_delete_while_active.c
+++ b/tests/spec/arb_occlusion_query/gen_delete_while_active.c
@@ -41,6 +41,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.window_visual = PIGLIT_GL_VISUAL_RGB;
 
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END
 
 enum piglit_result
@@ -87,14 +89,16 @@ piglit_display(void)
                        return PIGLIT_FAIL;
        }
 
-       printf ("Testing that glEndQuery on deleted query (expecting 
error).\n");
-       {
-               /* And ensure that we get an error if we try to end a deleted
-                * query. */
-               glEndQuery(GL_SAMPLES_PASSED);
+       if (!piglit_khr_no_error) {
+               printf ("Testing that glEndQuery on deleted query (expecting 
error).\n");
+               {
+                       /* And ensure that we get an error if we try to end a 
deleted
+                        * query. */
+                       glEndQuery(GL_SAMPLES_PASSED);
 
-               if (!piglit_check_gl_error(GL_INVALID_OPERATION))
-                       return PIGLIT_FAIL;
+                       if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+                               return PIGLIT_FAIL;
+               }
        }
 
        return PIGLIT_PASS;
diff --git a/tests/spec/arb_occlusion_query/occlusion_query.c 
b/tests/spec/arb_occlusion_query/occlusion_query.c
index c71c81041..d28699813 100644
--- a/tests/spec/arb_occlusion_query/occlusion_query.c
+++ b/tests/spec/arb_occlusion_query/occlusion_query.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
        config.window_width = 180;
        config.window_height = 100;
        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
 
diff --git a/tests/spec/arb_occlusion_query/occlusion_query_conform.c 
b/tests/spec/arb_occlusion_query/occlusion_query_conform.c
index 14b9a46e9..8d692d1be 100644
--- a/tests/spec/arb_occlusion_query/occlusion_query_conform.c
+++ b/tests/spec/arb_occlusion_query/occlusion_query_conform.c
@@ -48,6 +48,8 @@ config.window_visual =
        PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE |
        PIGLIT_GL_VISUAL_DEPTH;
 
+       config.khr_no_error_support = PIGLIT_HAS_ERRORS;
+
 PIGLIT_GL_TEST_CONFIG_END static GLuint
 find_unused_id(void)
 {
diff --git a/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c 
b/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c
index ff98adb3a..b3ba8a914 100644
--- a/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c
+++ b/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | 
PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c 
b/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c
index cf08de699..15bd56e5d 100644
--- a/tests/spec/arb_occlusion_query/occlusion_query_meta_save.c
+++ b/tests/spec/arb_occlusion_query/occlusion_query_meta_save.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
 
diff --git a/tests/spec/arb_occlusion_query/occlusion_query_order.c 
b/tests/spec/arb_occlusion_query/occlusion_query_order.c
index ea4c8405d..97ce1f00e 100644
--- a/tests/spec/arb_occlusion_query/occlusion_query_order.c
+++ b/tests/spec/arb_occlusion_query/occlusion_query_order.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        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
 
-- 
2.14.0

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