diff options
author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-08-10 15:36:54 +0200 |
---|---|---|
committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-08-22 10:53:07 +0200 |
commit | dabebff94ea2fb27f9c135bcddef494ae4053eaf (patch) | |
tree | 6cad3fdbe75cf7967bbca3281ffe2dee0132812a /tests/spec/gl-2.0 | |
parent | 7061eb09e6922fbe824b2916e4983837ecc7ca0b (diff) |
gl-2.0: set KHR_no_error status
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Diffstat (limited to 'tests/spec/gl-2.0')
-rw-r--r-- | tests/spec/gl-2.0/api/active-sampler-conflict.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/api/attrib-assignments.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/api/clip-flag-behavior.c | 33 | ||||
-rw-r--r-- | tests/spec/gl-2.0/api/getattriblocation-conventional.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/edgeflag-immediate.c | 2 | ||||
-rw-r--r-- | tests/spec/gl-2.0/glsl-link-empty-prog.c | 2 | ||||
-rw-r--r-- | tests/spec/gl-2.0/large-point-fs.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/reuse_fragment_shader.c | 2 | ||||
-rw-r--r-- | tests/spec/gl-2.0/two-sided-stencil.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/vertex-const-attr.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/vertexattribpointer-size-3.c | 1 | ||||
-rw-r--r-- | tests/spec/gl-2.0/vertexattribpointer.c | 1 |
12 files changed, 32 insertions, 15 deletions
diff --git a/tests/spec/gl-2.0/api/active-sampler-conflict.c b/tests/spec/gl-2.0/api/active-sampler-conflict.c index 74aed3689..848122ace 100644 --- a/tests/spec/gl-2.0/api/active-sampler-conflict.c +++ b/tests/spec/gl-2.0/api/active-sampler-conflict.c @@ -61,6 +61,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; PIGLIT_GL_TEST_CONFIG_END diff --git a/tests/spec/gl-2.0/api/attrib-assignments.c b/tests/spec/gl-2.0/api/attrib-assignments.c index 9452549ea..1b3651544 100644 --- a/tests/spec/gl-2.0/api/attrib-assignments.c +++ b/tests/spec/gl-2.0/api/attrib-assignments.c @@ -40,6 +40,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-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 25d7b4efd..c0e031e97 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -42,6 +42,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 @@ -146,25 +147,27 @@ piglit_init(int argc, char **argv) pass = check_enable_state(enum_name, enum_value, false) && pass; } - /* Check behavior of GL_CLIP_PLANE0 + n where n == max_clip_planes */ - enum_value = GL_CLIP_PLANE0 + max_clip_planes; - sprintf(enum_name, "GL_CLIP_PLANE0 + %d", max_clip_planes); + if (!piglit_khr_no_error) { + /* Check behavior of GL_CLIP_PLANE0 + n where n == max_clip_planes */ + enum_value = GL_CLIP_PLANE0 + max_clip_planes; + sprintf(enum_name, "GL_CLIP_PLANE0 + %d", max_clip_planes); - printf("Trying glIsEnabled(%s): ", enum_name); - b = glIsEnabled(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glIsEnabled(%s): ", enum_name); + b = glIsEnabled(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glGetBooleanv(%s): ", enum_name); - glGetBooleanv(enum_value, &b); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glGetBooleanv(%s): ", enum_name); + glGetBooleanv(enum_value, &b); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glEnable(%s): ", enum_name); - glEnable(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glEnable(%s): ", enum_name); + glEnable(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; - printf("Trying glDisable(%s): ", enum_name); - glDisable(enum_value); - pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + printf("Trying glDisable(%s): ", enum_name); + glDisable(enum_value); + pass = piglit_check_gl_error(GL_INVALID_ENUM) && print_ok() && pass; + } piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } diff --git a/tests/spec/gl-2.0/api/getattriblocation-conventional.c b/tests/spec/gl-2.0/api/getattriblocation-conventional.c index 9c1e3d747..a733b8f06 100644 --- a/tests/spec/gl-2.0/api/getattriblocation-conventional.c +++ b/tests/spec/gl-2.0/api/getattriblocation-conventional.c @@ -34,6 +34,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-2.0/edgeflag-immediate.c b/tests/spec/gl-2.0/edgeflag-immediate.c index 87e18e138..649dbc476 100644 --- a/tests/spec/gl-2.0/edgeflag-immediate.c +++ b/tests/spec/gl-2.0/edgeflag-immediate.c @@ -33,6 +33,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 static GLuint color_index; diff --git a/tests/spec/gl-2.0/glsl-link-empty-prog.c b/tests/spec/gl-2.0/glsl-link-empty-prog.c index 3bcfcbcd6..6e57a4345 100644 --- a/tests/spec/gl-2.0/glsl-link-empty-prog.c +++ b/tests/spec/gl-2.0/glsl-link-empty-prog.c @@ -61,6 +61,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 GLuint prog = 0; diff --git a/tests/spec/gl-2.0/large-point-fs.c b/tests/spec/gl-2.0/large-point-fs.c index 1470d0472..27e9c55ab 100644 --- a/tests/spec/gl-2.0/large-point-fs.c +++ b/tests/spec/gl-2.0/large-point-fs.c @@ -32,6 +32,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; 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-2.0/reuse_fragment_shader.c b/tests/spec/gl-2.0/reuse_fragment_shader.c index bf1042551..3985eec24 100644 --- a/tests/spec/gl-2.0/reuse_fragment_shader.c +++ b/tests/spec/gl-2.0/reuse_fragment_shader.c @@ -37,6 +37,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 static const float green[] = {0, 1, 0, 0}; diff --git a/tests/spec/gl-2.0/two-sided-stencil.c b/tests/spec/gl-2.0/two-sided-stencil.c index 2ae101970..66284c6b9 100644 --- a/tests/spec/gl-2.0/two-sided-stencil.c +++ b/tests/spec/gl-2.0/two-sided-stencil.c @@ -54,6 +54,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_RGBA | 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-2.0/vertex-const-attr.c b/tests/spec/gl-2.0/vertex-const-attr.c index bd161b368..60d71aadb 100644 --- a/tests/spec/gl-2.0/vertex-const-attr.c +++ b/tests/spec/gl-2.0/vertex-const-attr.c @@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; 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 *vs = diff --git a/tests/spec/gl-2.0/vertexattribpointer-size-3.c b/tests/spec/gl-2.0/vertexattribpointer-size-3.c index f886d4d3c..3b3f6dcf6 100644 --- a/tests/spec/gl-2.0/vertexattribpointer-size-3.c +++ b/tests/spec/gl-2.0/vertexattribpointer-size-3.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; 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-2.0/vertexattribpointer.c b/tests/spec/gl-2.0/vertexattribpointer.c index 46fabcc2c..ed5dbea76 100644 --- a/tests/spec/gl-2.0/vertexattribpointer.c +++ b/tests/spec/gl-2.0/vertexattribpointer.c @@ -31,6 +31,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END |