Re: [Piglit] [PATCH 44/50] gl-2.0: set KHR_no_error status
On 08/22/2017 02:15 AM, Timothy Arceri wrote:
On 11/08/17 01:22, Samuel Pitoiset wrote:
Signed-off-by: Samuel Pitoiset
---
tests/spec/gl-2.0/api/active-sampler-conflict.c | 1 +
tests/spec/gl-2.0/api/clip-flag-behavior.c | 33
++---
You missed:
getattriblocation-conventional.c
attrib-assignments.c
There are also some more that need to be updated in the parent dir:
tests/spec/gl-2.0/
Right, fixed!
2 files changed, 19 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/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);
}
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 44/50] gl-2.0: set KHR_no_error status
On 11/08/17 01:22, Samuel Pitoiset wrote:
Signed-off-by: Samuel Pitoiset
---
tests/spec/gl-2.0/api/active-sampler-conflict.c | 1 +
tests/spec/gl-2.0/api/clip-flag-behavior.c | 33 ++---
You missed:
getattriblocation-conventional.c
attrib-assignments.c
There are also some more that need to be updated in the parent dir:
tests/spec/gl-2.0/
2 files changed, 19 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/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);
}
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
[Piglit] [PATCH 44/50] gl-2.0: set KHR_no_error status
Signed-off-by: Samuel Pitoiset
---
tests/spec/gl-2.0/api/active-sampler-conflict.c | 1 +
tests/spec/gl-2.0/api/clip-flag-behavior.c | 33 ++---
2 files changed, 19 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/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);
}
--
2.14.0
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
