---
 tests/spec/arb_texture_multisample/clear.c                   |  1 +
 tests/spec/arb_texture_multisample/errors.c                  |  1 +
 tests/spec/arb_texture_multisample/fb-completeness.c         |  1 +
 tests/spec/arb_texture_multisample/minmax.c                  |  1 +
 tests/spec/arb_texture_multisample/negative-max-samples.c    |  1 +
 tests/spec/arb_texture_multisample/sample-depth.c            |  1 +
 tests/spec/arb_texture_multisample/sample-mask-execution.c   |  1 +
 tests/spec/arb_texture_multisample/sample-mask-value.c       | 11 +++++++----
 tests/spec/arb_texture_multisample/sample-mask.c             |  1 +
 tests/spec/arb_texture_multisample/sample-position.c         |  1 +
 tests/spec/arb_texture_multisample/stencil-clear.c           |  1 +
 tests/spec/arb_texture_multisample/texelfetch.c              |  1 +
 tests/spec/arb_texture_multisample/teximage-2d-multisample.c | 11 +++++++----
 tests/spec/arb_texture_multisample/teximage-3d-multisample.c | 11 +++++++----
 tests/spec/arb_texture_multisample/texstate.c                |  1 +
 15 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/tests/spec/arb_texture_multisample/clear.c 
b/tests/spec/arb_texture_multisample/clear.c
index f7ec826..1ef7907 100644
--- a/tests/spec/arb_texture_multisample/clear.c
+++ b/tests/spec/arb_texture_multisample/clear.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
        config.supports_gl_compat_version = 21;
 
        config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/errors.c 
b/tests/spec/arb_texture_multisample/errors.c
index ba9f1e6..42cc2c1 100644
--- a/tests/spec/arb_texture_multisample/errors.c
+++ b/tests/spec/arb_texture_multisample/errors.c
@@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.supports_gl_compat_version = 30;
 
     config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+       config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/fb-completeness.c 
b/tests/spec/arb_texture_multisample/fb-completeness.c
index 302b43d..1cb03a8 100644
--- a/tests/spec/arb_texture_multisample/fb-completeness.c
+++ b/tests/spec/arb_texture_multisample/fb-completeness.c
@@ -26,6 +26,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     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_texture_multisample/minmax.c 
b/tests/spec/arb_texture_multisample/minmax.c
index 9d54e72..9729e9e 100644
--- a/tests/spec/arb_texture_multisample/minmax.c
+++ b/tests/spec/arb_texture_multisample/minmax.c
@@ -28,6 +28,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.supports_gl_compat_version = 10;
     config.supports_gl_core_version = 31;
     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_texture_multisample/negative-max-samples.c 
b/tests/spec/arb_texture_multisample/negative-max-samples.c
index 1f9a3ce..b5f0441 100644
--- a/tests/spec/arb_texture_multisample/negative-max-samples.c
+++ b/tests/spec/arb_texture_multisample/negative-max-samples.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.supports_gl_compat_version = 10;
 
     config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+    config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/sample-depth.c 
b/tests/spec/arb_texture_multisample/sample-depth.c
index d6f5313..ef2be19 100644
--- a/tests/spec/arb_texture_multisample/sample-depth.c
+++ b/tests/spec/arb_texture_multisample/sample-depth.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+    config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/sample-mask-execution.c 
b/tests/spec/arb_texture_multisample/sample-mask-execution.c
index 4605465..22775b7 100644
--- a/tests/spec/arb_texture_multisample/sample-mask-execution.c
+++ b/tests/spec/arb_texture_multisample/sample-mask-execution.c
@@ -27,6 +27,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.supports_gl_compat_version = 30;
 
     config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+    config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/sample-mask-value.c 
b/tests/spec/arb_texture_multisample/sample-mask-value.c
index eefa48b..0465fe1 100644
--- a/tests/spec/arb_texture_multisample/sample-mask-value.c
+++ b/tests/spec/arb_texture_multisample/sample-mask-value.c
@@ -26,6 +26,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     config.window_visual = PIGLIT_GL_VISUAL_RGB;
+    config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -59,11 +60,13 @@ piglit_init(int argc, char **argv)
         }
     }
 
-    printf("Checking that correct errors are generated for out of bounds\n");
-    glGetIntegeri_v(GL_SAMPLE_MASK_VALUE, maxMaskWords, &result);
+    if (!piglit_khr_no_error) {
+        printf("Checking that correct errors are generated for out of 
bounds\n");
+        glGetIntegeri_v(GL_SAMPLE_MASK_VALUE, maxMaskWords, &result);
 
-    if (!piglit_check_gl_error(GL_INVALID_VALUE))
-        piglit_report_result(PIGLIT_FAIL);
+        if (!piglit_check_gl_error(GL_INVALID_VALUE))
+            piglit_report_result(PIGLIT_FAIL);
+    }
 
     piglit_report_result(PIGLIT_PASS);
 }
diff --git a/tests/spec/arb_texture_multisample/sample-mask.c 
b/tests/spec/arb_texture_multisample/sample-mask.c
index 5c63682..9c5b2d6 100644
--- a/tests/spec/arb_texture_multisample/sample-mask.c
+++ b/tests/spec/arb_texture_multisample/sample-mask.c
@@ -26,6 +26,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     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_texture_multisample/sample-position.c 
b/tests/spec/arb_texture_multisample/sample-position.c
index a5f4b3a..89f7c10 100644
--- a/tests/spec/arb_texture_multisample/sample-position.c
+++ b/tests/spec/arb_texture_multisample/sample-position.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     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_texture_multisample/stencil-clear.c 
b/tests/spec/arb_texture_multisample/stencil-clear.c
index cbd4b62..ca0fd81 100644
--- a/tests/spec/arb_texture_multisample/stencil-clear.c
+++ b/tests/spec/arb_texture_multisample/stencil-clear.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
     config.window_width = TEX_WIDTH;
     config.window_height = TEX_HEIGHT;
+    config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/texelfetch.c 
b/tests/spec/arb_texture_multisample/texelfetch.c
index 1f1a2f9..8dfe28b 100644
--- a/tests/spec/arb_texture_multisample/texelfetch.c
+++ b/tests/spec/arb_texture_multisample/texelfetch.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+    config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_multisample/teximage-2d-multisample.c 
b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c
index 0e9c877..8063a78 100644
--- a/tests/spec/arb_texture_multisample/teximage-2d-multisample.c
+++ b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        config.supports_gl_core_version = 31;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -64,10 +65,12 @@ piglit_init(int argc, char **argv)
        pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
 
        /* Pass an Invalid Enum */
-       glBindTexture(GL_TEXTURE_2D, textures[2]);
-       glTexImage2DMultisample(GL_TEXTURE_2D, 4, GL_RGB,
-                               1024, 1024, GL_FALSE);
-       pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+       if (!piglit_khr_no_error) {
+               glBindTexture(GL_TEXTURE_2D, textures[2]);
+               glTexImage2DMultisample(GL_TEXTURE_2D, 4, GL_RGB,
+                                       1024, 1024, GL_FALSE);
+               pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+       }
 
        piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/spec/arb_texture_multisample/teximage-3d-multisample.c 
b/tests/spec/arb_texture_multisample/teximage-3d-multisample.c
index dcbbbf4..4e6e476 100644
--- a/tests/spec/arb_texture_multisample/teximage-3d-multisample.c
+++ b/tests/spec/arb_texture_multisample/teximage-3d-multisample.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
        config.supports_gl_compat_version = 10;
        config.supports_gl_core_version = 31;
+       config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -64,10 +65,12 @@ piglit_init(int argc, char **argv)
        pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
 
        /* Pass an Invalid Enum */
-       glBindTexture(GL_TEXTURE_2D, textures[2]);
-       glTexImage3DMultisample(GL_TEXTURE_2D, 4, GL_RGB,
-                               1024, 1024, 4, GL_FALSE);
-       pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+       if (!piglit_khr_no_error) {
+               glBindTexture(GL_TEXTURE_2D, textures[2]);
+               glTexImage3DMultisample(GL_TEXTURE_2D, 4, GL_RGB,
+                                       1024, 1024, 4, GL_FALSE);
+               pass = piglit_check_gl_error(GL_INVALID_ENUM) && pass;
+       }
 
        piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/spec/arb_texture_multisample/texstate.c 
b/tests/spec/arb_texture_multisample/texstate.c
index 3d9fd26..a0cca33 100644
--- a/tests/spec/arb_texture_multisample/texstate.c
+++ b/tests/spec/arb_texture_multisample/texstate.c
@@ -26,6 +26,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 
     config.supports_gl_compat_version = 30;
     config.window_visual = PIGLIT_GL_VISUAL_RGB;
+    config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
-- 
2.9.4

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

Reply via email to