[Piglit] [PATCH 45/50] gl-3.0: set KHR_no_error status
Samuel Pitoiset
samuel.pitoiset at gmail.com
Thu Aug 10 15:22:45 UTC 2017
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
.../gl-3.0/api/bindfragdata-invalid-parameters.c | 1 +
tests/spec/gl-3.0/api/bindfragdata-link-error.c | 1 +
.../gl-3.0/api/bindfragdata-nonexistent-variable.c | 1 +
tests/spec/gl-3.0/api/clearbuffer-common.c | 1 +
tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c | 1 +
.../gl-3.0/api/clearbuffer-invalid-drawbuffer.c | 1 +
tests/spec/gl-3.0/api/forward-compatible-bit.c | 1 +
tests/spec/gl-3.0/api/genmipmap-errors.c | 1 +
tests/spec/gl-3.0/api/getfragdatalocation.c | 32 ++++++++++++----------
tests/spec/gl-3.0/api/integer-errors.c | 1 +
tests/spec/gl-3.0/bound-resource-limits.c | 1 +
tests/spec/gl-3.0/minmax.c | 2 ++
tests/spec/gl-3.0/multidrawarrays-vertexid.c | 1 +
tests/spec/gl-3.0/render-integer.c | 1 +
.../required-renderbuffer-attachment-formats.c | 1 +
tests/spec/gl-3.0/required-sized-texture-formats.c | 1 +
.../gl-3.0/required-texture-attachment-formats.c | 1 +
tests/spec/gl-3.0/texture-integer.c | 1 +
tests/spec/gl-3.0/vertexattribipointer.c | 1 +
19 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c
index bbfe1c51c..f9ae11fcd 100644
--- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c
+++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
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/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c
index c25ca67e0..63dbbf237 100644
--- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c
+++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c
@@ -31,6 +31,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
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/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c
index b91cc23ba..1cae692b4 100644
--- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c
+++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c
@@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
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/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c
index 6f6261baa..be4c70b25 100644
--- a/tests/spec/gl-3.0/api/clearbuffer-common.c
+++ b/tests/spec/gl-3.0/api/clearbuffer-common.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c
index b487af689..103bff69a 100644
--- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c
+++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c
@@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
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/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c
index 752d74973..c311e20a3 100644
--- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c
+++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
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/gl-3.0/api/forward-compatible-bit.c b/tests/spec/gl-3.0/api/forward-compatible-bit.c
index 24faff9f1..23284849d 100644
--- a/tests/spec/gl-3.0/api/forward-compatible-bit.c
+++ b/tests/spec/gl-3.0/api/forward-compatible-bit.c
@@ -52,6 +52,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
config.require_forward_compatible_context = expect_fwd_compat;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/api/genmipmap-errors.c b/tests/spec/gl-3.0/api/genmipmap-errors.c
index 0b48cc1f1..40ff62fbc 100644
--- a/tests/spec/gl-3.0/api/genmipmap-errors.c
+++ b/tests/spec/gl-3.0/api/genmipmap-errors.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c
index 6b2bed4f0..7a130f4ed 100644
--- a/tests/spec/gl-3.0/api/getfragdatalocation.c
+++ b/tests/spec/gl-3.0/api/getfragdatalocation.c
@@ -31,6 +31,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
@@ -88,20 +89,23 @@ void piglit_init(int argc, char **argv)
if (!piglit_check_gl_error(GL_NO_ERROR))
piglit_report_result(PIGLIT_FAIL);
- /* Page 237 (page 253 of the PDF) of the OpenGL 3.0 spec says:
- *
- * "If program has not been successfully linked, the error INVALID
- * OPERATION is generated. If name is not a varying out variable,
- * or if an error occurs, -1 will be returned."
- */
- printf("Querying location before linking...\n");
- loc = glGetFragDataLocation(prog, "v");
- if (!piglit_check_gl_error(GL_INVALID_OPERATION))
- piglit_report_result(PIGLIT_FAIL);
-
- if (loc != -1) {
- fprintf(stderr, "Expected location = -1, got %d\n", loc);
- piglit_report_result(PIGLIT_FAIL);
+ if (!piglit_khr_no_error) {
+ /* Page 237 (page 253 of the PDF) of the OpenGL 3.0 spec says:
+ *
+ * "If program has not been successfully linked, the error
+ * INVALID OPERATION is generated. If name is not a varying
+ * out variable, or if an error occurs, -1 will be
+ * returned."
+ */
+ printf("Querying location before linking...\n");
+ loc = glGetFragDataLocation(prog, "v");
+ if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+ piglit_report_result(PIGLIT_FAIL);
+
+ if (loc != -1) {
+ fprintf(stderr, "Expected location = -1, got %d\n", loc);
+ piglit_report_result(PIGLIT_FAIL);
+ }
}
glLinkProgram(prog);
diff --git a/tests/spec/gl-3.0/api/integer-errors.c b/tests/spec/gl-3.0/api/integer-errors.c
index acec20540..bbb1d324b 100644
--- a/tests/spec/gl-3.0/api/integer-errors.c
+++ b/tests/spec/gl-3.0/api/integer-errors.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/bound-resource-limits.c b/tests/spec/gl-3.0/bound-resource-limits.c
index 64533a036..19cc21aa6 100644
--- a/tests/spec/gl-3.0/bound-resource-limits.c
+++ b/tests/spec/gl-3.0/bound-resource-limits.c
@@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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.0/minmax.c b/tests/spec/gl-3.0/minmax.c
index b80486c49..fba7239c0 100644
--- a/tests/spec/gl-3.0/minmax.c
+++ b/tests/spec/gl-3.0/minmax.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
enum piglit_result
diff --git a/tests/spec/gl-3.0/multidrawarrays-vertexid.c b/tests/spec/gl-3.0/multidrawarrays-vertexid.c
index 79c5e2fbd..47ee89e78 100644
--- a/tests/spec/gl-3.0/multidrawarrays-vertexid.c
+++ b/tests/spec/gl-3.0/multidrawarrays-vertexid.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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.0/render-integer.c b/tests/spec/gl-3.0/render-integer.c
index 30b59c4ae..2937ec50c 100644
--- a/tests/spec/gl-3.0/render-integer.c
+++ b/tests/spec/gl-3.0/render-integer.c
@@ -32,6 +32,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
index 5a362be84..ca716a4da 100644
--- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
+++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
@@ -137,4 +137,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
setup_required_size_test(argc, argv, &config);
target_version = MAX2(config.supports_gl_compat_version,
config.supports_gl_core_version);
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/required-sized-texture-formats.c b/tests/spec/gl-3.0/required-sized-texture-formats.c
index b536ecc92..4cea5c1e8 100644
--- a/tests/spec/gl-3.0/required-sized-texture-formats.c
+++ b/tests/spec/gl-3.0/required-sized-texture-formats.c
@@ -271,4 +271,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
setup_required_size_test(argc, argv, &config);
target_version = MAX2(config.supports_gl_compat_version,
config.supports_gl_core_version);
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/required-texture-attachment-formats.c b/tests/spec/gl-3.0/required-texture-attachment-formats.c
index a4fc6d392..701f874ce 100644
--- a/tests/spec/gl-3.0/required-texture-attachment-formats.c
+++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c
@@ -147,4 +147,5 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
setup_required_size_test(argc, argv, &config);
target_version = MAX2(config.supports_gl_compat_version,
config.supports_gl_core_version);
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c
index 5fe90aa33..8caa00043 100644
--- a/tests/spec/gl-3.0/texture-integer.c
+++ b/tests/spec/gl-3.0/texture-integer.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 10;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.0/vertexattribipointer.c b/tests/spec/gl-3.0/vertexattribipointer.c
index 8ac00f7c5..7ea0cadcb 100644
--- a/tests/spec/gl-3.0/vertexattribipointer.c
+++ b/tests/spec/gl-3.0/vertexattribipointer.c
@@ -31,6 +31,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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
More information about the Piglit
mailing list