[Piglit] [PATCH 47/50] gl-3.2: set KHR_no_error status
Samuel Pitoiset
samuel.pitoiset at gmail.com
Thu Aug 10 15:22:47 UTC 2017
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
tests/spec/gl-3.2/adj-prims.c | 1 +
tests/spec/gl-3.2/basevertex-vertexid.c | 1 +
tests/spec/gl-3.2/clear-no-buffers.c | 1 +
tests/spec/gl-3.2/depth-tex-sampling.c | 11 +++++++----
tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c | 1 +
tests/spec/gl-3.2/get-buffer-parameter-i64v.c | 1 +
tests/spec/gl-3.2/get-integer-64iv.c | 1 +
tests/spec/gl-3.2/get-integer-64v.c | 1 +
.../gl-coord-replace-doesnt-eliminate-frag-tex-coords.c | 2 ++
tests/spec/gl-3.2/glsl-resource-not-bound.c | 2 ++
tests/spec/gl-3.2/minmax.c | 1 +
tests/spec/gl-3.2/pointsprite-coord.c | 1 +
tests/spec/gl-3.2/pointsprite-origin.c | 1 +
tests/spec/gl-3.2/texture-border-deprecated.c | 1 +
14 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/tests/spec/gl-3.2/adj-prims.c b/tests/spec/gl-3.2/adj-prims.c
index 9d2f121f2..794ab3dc9 100644
--- a/tests/spec/gl-3.2/adj-prims.c
+++ b/tests/spec/gl-3.2/adj-prims.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_height = 200;
config.supports_gl_core_version = 32;
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.2/basevertex-vertexid.c b/tests/spec/gl-3.2/basevertex-vertexid.c
index 90b8f02ca..9094800f1 100644
--- a/tests/spec/gl-3.2/basevertex-vertexid.c
+++ b/tests/spec/gl-3.2/basevertex-vertexid.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
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.2/clear-no-buffers.c b/tests/spec/gl-3.2/clear-no-buffers.c
index 0d6718acb..29f384e7e 100644
--- a/tests/spec/gl-3.2/clear-no-buffers.c
+++ b/tests/spec/gl-3.2/clear-no-buffers.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
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/gl-3.2/depth-tex-sampling.c b/tests/spec/gl-3.2/depth-tex-sampling.c
index c41f1769a..a74f600df 100644
--- a/tests/spec/gl-3.2/depth-tex-sampling.c
+++ b/tests/spec/gl-3.2/depth-tex-sampling.c
@@ -39,6 +39,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
@@ -77,10 +78,12 @@ make_depth_texture(void)
piglit_report_result(PIGLIT_FAIL);
}
- /* this call should generate an error in the core profile */
- glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY);
- if (!piglit_check_gl_error(GL_INVALID_ENUM)) {
- piglit_report_result(PIGLIT_FAIL);
+ if (!piglit_khr_no_error) {
+ /* this call should generate an error in the core profile */
+ glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY);
+ if (!piglit_check_gl_error(GL_INVALID_ENUM)) {
+ piglit_report_result(PIGLIT_FAIL);
+ }
}
return tex;
diff --git a/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c b/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c
index 7c247ba1d..b523b6ae4 100644
--- a/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c
+++ b/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c
@@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
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.2/get-buffer-parameter-i64v.c b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c
index 70ac18905..e7c79e9dc 100644
--- a/tests/spec/gl-3.2/get-buffer-parameter-i64v.c
+++ b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.supports_gl_compat_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.2/get-integer-64iv.c b/tests/spec/gl-3.2/get-integer-64iv.c
index 4b994f9e6..6a07e9802 100644
--- a/tests/spec/gl-3.2/get-integer-64iv.c
+++ b/tests/spec/gl-3.2/get-integer-64iv.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.supports_gl_compat_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.2/get-integer-64v.c b/tests/spec/gl-3.2/get-integer-64v.c
index 2e0e74b9e..e84501e21 100644
--- a/tests/spec/gl-3.2/get-integer-64v.c
+++ b/tests/spec/gl-3.2/get-integer-64v.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.supports_gl_compat_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c b/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c
index f7d11117e..a67d6195a 100644
--- a/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c
+++ b/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c
@@ -34,6 +34,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
static const char *vstext =
diff --git a/tests/spec/gl-3.2/glsl-resource-not-bound.c b/tests/spec/gl-3.2/glsl-resource-not-bound.c
index 35857886f..edcede20a 100644
--- a/tests/spec/gl-3.2/glsl-resource-not-bound.c
+++ b/tests/spec/gl-3.2/glsl-resource-not-bound.c
@@ -29,6 +29,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 GLuint
diff --git a/tests/spec/gl-3.2/minmax.c b/tests/spec/gl-3.2/minmax.c
index b8d9cfd36..e44246f3e 100644
--- a/tests/spec/gl-3.2/minmax.c
+++ b/tests/spec/gl-3.2/minmax.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
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.2/pointsprite-coord.c b/tests/spec/gl-3.2/pointsprite-coord.c
index 047d3d5cd..54e9172cf 100644
--- a/tests/spec/gl-3.2/pointsprite-coord.c
+++ b/tests/spec/gl-3.2/pointsprite-coord.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
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.2/pointsprite-origin.c b/tests/spec/gl-3.2/pointsprite-origin.c
index 9009d2f34..a3f02f70a 100644
--- a/tests/spec/gl-3.2/pointsprite-origin.c
+++ b/tests/spec/gl-3.2/pointsprite-origin.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
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.2/texture-border-deprecated.c b/tests/spec/gl-3.2/texture-border-deprecated.c
index 625e6e5d1..9c59aa353 100644
--- a/tests/spec/gl-3.2/texture-border-deprecated.c
+++ b/tests/spec/gl-3.2/texture-border-deprecated.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.supports_gl_compat_version = 0;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
--
2.14.0
More information about the Piglit
mailing list