Re: [Piglit] [PATCH 50/50] general: add missing KHR_no_error status
On 11/08/17 01:22, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset --- tests/general/draw-pixels.c | 2 ++ tests/general/geterror-inside-begin.c | 2 ++ tests/general/geterror-invalid-enum.c | 2 ++ tests/general/masked-clear.c | 1 + tests/general/roundmode-pixelstore.c | 10 +++--- tests/general/select.c| 2 ++ tests/general/tex-errors.c| 2 ++ tests/general/texunits.c | 24 ++-- 8 files changed, 32 insertions(+), 13 deletions(-) diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index 65f512266..a6c06c4d9 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -57,6 +57,8 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL; + config.khr_no_error_support = PIGLIT_HAS_ERRORS; I think you should just add a !piglit_khr_no_error to the is_format_type_mismatch(format, type) test rather than skipping the whole thing. With that 46-50 are: Reviewed-by: Timothy Arceri ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 45/50] gl-3.0: set KHR_no_error status
You seem to have skipped over 2.1 Reviewed-by: Timothy Arceri ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 43/50] arb_vertex_attrib_64bit: set KHR_no_error status
Reviewed-by: Timothy Arceri ___ 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
Re: [Piglit] [PATCH 42/50] arb_texture_view: set KHR_no_error status
On 11/08/17 01:22, Samuel Pitoiset wrote: Signed-off-by: Samuel Pitoiset --- tests/spec/arb_texture_view/clear-into-view-2d-array.c | 1 + tests/spec/arb_texture_view/clear-into-view-2d.c | 1 + tests/spec/arb_texture_view/clear-into-view-layered.c| 1 + tests/spec/arb_texture_view/copytexsubimage-layers.c | 1 + tests/spec/arb_texture_view/cubemap-view.c | 1 + tests/spec/arb_texture_view/formats.c| 12 tests/spec/arb_texture_view/getteximage-srgb.c | 1 + tests/spec/arb_texture_view/max-level.c | 1 + tests/spec/arb_texture_view/mipgen.c | 2 ++ tests/spec/arb_texture_view/params.c | 1 + tests/spec/arb_texture_view/queries.c| 1 + tests/spec/arb_texture_view/rendering-formats.c | 1 + tests/spec/arb_texture_view/rendering-r32ui.c| 1 + tests/spec/arb_texture_view/rendering_layers.c | 1 + tests/spec/arb_texture_view/rendering_levels.c | 1 + tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c | 1 + .../arb_texture_view/sampling-2d-array-as-cubemap-array.c| 1 + tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c | 1 + tests/spec/arb_texture_view/targets.c| 1 + tests/spec/arb_texture_view/texsubimage-layers.c | 1 + tests/spec/arb_texture_view/texsubimage-levels.c | 1 + tests/spec/arb_texture_view/texture-immutable-levels.c | 1 + 22 files changed, 30 insertions(+), 4 deletions(-) diff --git a/tests/spec/arb_texture_view/clear-into-view-2d-array.c b/tests/spec/arb_texture_view/clear-into-view-2d-array.c index 7f3a5bf36..4ab68b1c5 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d-array.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d-array.c @@ -36,6 +36,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/arb_texture_view/clear-into-view-2d.c b/tests/spec/arb_texture_view/clear-into-view-2d.c index b211386f7..cdb605972 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d.c @@ -36,6 +36,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/arb_texture_view/clear-into-view-layered.c b/tests/spec/arb_texture_view/clear-into-view-layered.c index d6405f221..b134d7d44 100644 --- a/tests/spec/arb_texture_view/clear-into-view-layered.c +++ b/tests/spec/arb_texture_view/clear-into-view-layered.c @@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; /* for layered rendering */ 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/arb_texture_view/copytexsubimage-layers.c b/tests/spec/arb_texture_view/copytexsubimage-layers.c index 19f8b28f8..7d374fc0e 100644 --- a/tests/spec/arb_texture_view/copytexsubimage-layers.c +++ b/tests/spec/arb_texture_view/copytexsubimage-layers.c @@ -36,6 +36,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/arb_texture_view/cubemap-view.c b/tests/spec/arb_texture_view/cubemap-view.c index 1a2e44460..96372062c 100644 --- a/tests/spec/arb_texture_view/cubemap-view.c +++ b/tests/spec/arb_texture_view/cubemap-view.c @@ -42,6 +42,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/arb_texture_view/formats.c b/tests/spec/arb_texture_view/formats.c index 1db244523..56415db52 100644 --- a/tests/spec/arb_texture_view/formats.c +++ b/tests/spec/arb_texture_view/formats.c @@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_es_version = 31; config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE; + config.khr_no_error_support = PIGLIT_NO_ERRORS; PIGLIT_GL_TEST_CONFIG_END @@ -306,10 +307,13 @@ test_format_errors(GLenum format_class) pass = check_format_array(GL_NO_ERROR, numFormats, legalFormats, target,
Re: [Piglit] [PATCH 33/50] arb_occlusion_query2: set KHR_no_error status
On 08/21/2017 09:38 AM, Timothy Arceri wrote:
On 11/08/17 01:22, Samuel Pitoiset wrote:
Signed-off-by: Samuel Pitoiset
---
tests/spec/arb_occlusion_query2/api.c| 34
+---
tests/spec/arb_occlusion_query2/render.c | 1 +
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/tests/spec/arb_occlusion_query2/api.c
b/tests/spec/arb_occlusion_query2/api.c
index 429b6b3f8..2ba6877a3 100644
--- a/tests/spec/arb_occlusion_query2/api.c
+++ b/tests/spec/arb_occlusion_query2/api.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_visual = (PIGLIT_GL_VISUAL_RGB |
PIGLIT_GL_VISUAL_DOUBLE |
PIGLIT_GL_VISUAL_DEPTH);
+config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
@@ -52,10 +53,14 @@ test_error_begin_while_other_active(void)
glBeginQuery(GL_SAMPLES_PASSED, oq[0]);
if (!piglit_check_gl_error(0))
pass = false;
-glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]);
-if (!piglit_check_gl_error(GL_INVALID_OPERATION))
-pass = false;
-glEndQuery(GL_ANY_SAMPLES_PASSED);
+
+if (!piglit_khr_no_error) {
+glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]);
+if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+pass = false;
+glEndQuery(GL_ANY_SAMPLES_PASSED);
+}
+
You can drop this change.
glEndQuery(GL_SAMPLES_PASSED);
piglit_reset_gl_error();
@@ -66,10 +71,14 @@ test_error_begin_while_other_active(void)
glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[0]);
if (!piglit_check_gl_error(0))
pass = false;
-glBeginQuery(GL_SAMPLES_PASSED, oq[1]);
-if (!piglit_check_gl_error(GL_INVALID_OPERATION))
-pass = false;
-glEndQuery(GL_SAMPLES_PASSED);
+
+if (!piglit_khr_no_error) {
+glBeginQuery(GL_SAMPLES_PASSED, oq[1]);
+if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+pass = false;
+glEndQuery(GL_SAMPLES_PASSED);
+}
+
And this change.
glEndQuery(GL_ANY_SAMPLES_PASSED);
piglit_reset_gl_error();
@@ -269,9 +278,12 @@ piglit_display(void)
pass = test_counter_bits() && pass;
pass = test_current_query() && pass;
-pass = test_error_begin_wrong_target() && pass;
-pass = test_error_end_wrong_target() && pass;
-pass = test_error_begin_while_other_active() && pass;
+
+if (!piglit_khr_no_error) {
+pass = test_error_begin_wrong_target() && pass;
+pass = test_error_end_wrong_target() && pass;
+pass = test_error_begin_while_other_active() && pass;
Because you are skipping calling the function here.
With that change:
Reviewed-by: Timothy Arceri
Right, fixed locally.
Thanks!
+}
piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
diff --git a/tests/spec/arb_occlusion_query2/render.c
b/tests/spec/arb_occlusion_query2/render.c
index 2d593fbfe..14eabdd44 100644
--- a/tests/spec/arb_occlusion_query2/render.c
+++ b/tests/spec/arb_occlusion_query2/render.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 | PIGLIT_GL_VISUAL_DEPTH;
+config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 33/50] arb_occlusion_query2: set KHR_no_error status
On 11/08/17 01:22, Samuel Pitoiset wrote:
Signed-off-by: Samuel Pitoiset
---
tests/spec/arb_occlusion_query2/api.c| 34 +---
tests/spec/arb_occlusion_query2/render.c | 1 +
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/tests/spec/arb_occlusion_query2/api.c
b/tests/spec/arb_occlusion_query2/api.c
index 429b6b3f8..2ba6877a3 100644
--- a/tests/spec/arb_occlusion_query2/api.c
+++ b/tests/spec/arb_occlusion_query2/api.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_visual = (PIGLIT_GL_VISUAL_RGB |
PIGLIT_GL_VISUAL_DOUBLE |
PIGLIT_GL_VISUAL_DEPTH);
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
@@ -52,10 +53,14 @@ test_error_begin_while_other_active(void)
glBeginQuery(GL_SAMPLES_PASSED, oq[0]);
if (!piglit_check_gl_error(0))
pass = false;
- glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]);
- if (!piglit_check_gl_error(GL_INVALID_OPERATION))
- pass = false;
- glEndQuery(GL_ANY_SAMPLES_PASSED);
+
+ if (!piglit_khr_no_error) {
+ glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[1]);
+ if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+ pass = false;
+ glEndQuery(GL_ANY_SAMPLES_PASSED);
+ }
+
You can drop this change.
glEndQuery(GL_SAMPLES_PASSED);
piglit_reset_gl_error();
@@ -66,10 +71,14 @@ test_error_begin_while_other_active(void)
glBeginQuery(GL_ANY_SAMPLES_PASSED, oq[0]);
if (!piglit_check_gl_error(0))
pass = false;
- glBeginQuery(GL_SAMPLES_PASSED, oq[1]);
- if (!piglit_check_gl_error(GL_INVALID_OPERATION))
- pass = false;
- glEndQuery(GL_SAMPLES_PASSED);
+
+ if (!piglit_khr_no_error) {
+ glBeginQuery(GL_SAMPLES_PASSED, oq[1]);
+ if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+ pass = false;
+ glEndQuery(GL_SAMPLES_PASSED);
+ }
+
And this change.
glEndQuery(GL_ANY_SAMPLES_PASSED);
piglit_reset_gl_error();
@@ -269,9 +278,12 @@ piglit_display(void)
pass = test_counter_bits() && pass;
pass = test_current_query() && pass;
- pass = test_error_begin_wrong_target() && pass;
- pass = test_error_end_wrong_target() && pass;
- pass = test_error_begin_while_other_active() && pass;
+
+ if (!piglit_khr_no_error) {
+ pass = test_error_begin_wrong_target() && pass;
+ pass = test_error_end_wrong_target() && pass;
+ pass = test_error_begin_while_other_active() && pass;
Because you are skipping calling the function here.
With that change:
Reviewed-by: Timothy Arceri
+ }
piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
diff --git a/tests/spec/arb_occlusion_query2/render.c b/tests/spec/arb_occlusion_query2/render.c
index 2d593fbfe..14eabdd44 100644
--- a/tests/spec/arb_occlusion_query2/render.c
+++ b/tests/spec/arb_occlusion_query2/render.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 |
PIGLIT_GL_VISUAL_DEPTH;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
Re: [Piglit] [PATCH 32/50] arb_internalformat_query2: set KHR_no_error status
31-32: Reviewed-by: Timothy Arceri ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
