On 11/08/17 01:22, Samuel Pitoiset wrote:
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
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, tex, levels, layers) && pass;
- /* ensure TextureView of illegal formats returns an error */
- pass = check_format_array(GL_INVALID_OPERATION,
- totalFormats, illegalFormats,
- target, tex, levels, layers) && pass;
+ if (!piglit_khr_no_error) {
+ /* ensure TextureView of illegal formats returns an error */
+ pass = check_format_array(GL_INVALID_OPERATION,
+ totalFormats, illegalFormats,
+ target, tex, levels, layers) && pass;
+ }
+
err_out:
glDeleteTextures(1, &tex);
diff --git a/tests/spec/arb_texture_view/getteximage-srgb.c b/tests/spec/arb_texture_view/getteximage-srgb.c
index d41959c26..fc149419e 100644
--- a/tests/spec/arb_texture_view/getteximage-srgb.c
+++ b/tests/spec/arb_texture_view/getteximage-srgb.c
@@ -34,6 +34,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 15;
config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_view/max-level.c b/tests/spec/arb_texture_view/max-level.c
index ee25adf99..6ac9c96e0 100644
--- a/tests/spec/arb_texture_view/max-level.c
+++ b/tests/spec/arb_texture_view/max-level.c
@@ -40,6 +40,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/mipgen.c b/tests/spec/arb_texture_view/mipgen.c
index 6d60c5143..3502aff00 100644
--- a/tests/spec/arb_texture_view/mipgen.c
+++ b/tests/spec/arb_texture_view/mipgen.c
@@ -35,6 +35,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
/**
diff --git a/tests/spec/arb_texture_view/params.c
b/tests/spec/arb_texture_view/params.c
index 144c247d8..db7afa61b 100644
--- a/tests/spec/arb_texture_view/params.c
+++ b/tests/spec/arb_texture_view/params.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 31;
config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
Here I think we should do:
if (!piglit_khr_no_error) {
X(invalid_texture_param(), "Invalid texture or origtexture");
X(invalid_layer_param(GL_TEXTURE_1D_ARRAY), "Invalid layer param 1D");
X(invalid_layer_param(GL_TEXTURE_2D_ARRAY), "Invalid layer param 2D");
X(invalid_level_param(), "Invalid level param");
} else {
X(levels_clamping(), "Minlevel range and numlevel clamp");
X(layers_clamping(), "Minlayer range and numlayer clamp");
}
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_view/queries.c b/tests/spec/arb_texture_view/queries.c
index ab563bec6..026d97ece 100644
--- a/tests/spec/arb_texture_view/queries.c
+++ b/tests/spec/arb_texture_view/queries.c
@@ -37,6 +37,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
diff --git a/tests/spec/arb_texture_view/rendering-formats.c b/tests/spec/arb_texture_view/rendering-formats.c
index b7145dc90..bd9a4d39c 100644
--- a/tests/spec/arb_texture_view/rendering-formats.c
+++ b/tests/spec/arb_texture_view/rendering-formats.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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
diff --git a/tests/spec/arb_texture_view/rendering-r32ui.c b/tests/spec/arb_texture_view/rendering-r32ui.c
index 4a4037bd3..a28a08929 100644
--- a/tests/spec/arb_texture_view/rendering-r32ui.c
+++ b/tests/spec/arb_texture_view/rendering-r32ui.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/arb_texture_view/rendering_layers.c b/tests/spec/arb_texture_view/rendering_layers.c
index e122a3a84..c79da07fd 100644
--- a/tests/spec/arb_texture_view/rendering_layers.c
+++ b/tests/spec/arb_texture_view/rendering_layers.c
@@ -38,6 +38,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
diff --git a/tests/spec/arb_texture_view/rendering_levels.c b/tests/spec/arb_texture_view/rendering_levels.c
index 728e89af2..5f2208eb4 100644
--- a/tests/spec/arb_texture_view/rendering_levels.c
+++ b/tests/spec/arb_texture_view/rendering_levels.c
@@ -38,6 +38,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
diff --git a/tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c b/tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c
index e6b49d164..1c219cc98 100644
--- a/tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c
+++ b/tests/spec/arb_texture_view/sampling-2d-array-as-2d-layer.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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
diff --git a/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap-array.c b/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap-array.c
index 6d7574c24..07e16d202 100644
--- a/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap-array.c
+++ b/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap-array.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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
diff --git a/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c b/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c
index fbfe99ab6..a7f02b5e0 100644
--- a/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c
+++ b/tests/spec/arb_texture_view/sampling-2d-array-as-cubemap.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 30;
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
diff --git a/tests/spec/arb_texture_view/targets.c b/tests/spec/arb_texture_view/targets.c
index 2dc4c3e9a..03fec72ea 100644
--- a/tests/spec/arb_texture_view/targets.c
+++ b/tests/spec/arb_texture_view/targets.c
@@ -44,6 +44,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_HAS_ERRORS;
Here too it probably wouldn't hurt to do:
if (!piglit_khr_no_error)
/* ensure TextureView of illegal targets returns an error */
pass = pass && check_target_array(GL_INVALID_OPERATION,
numIllegalTargets,
illegalTargets,
GL_RG16, tex, levels);
}
Just to make sure the valid targets don't hit any segfaults or something
nasty like that.
With those two changes 34-42 are:
Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/arb_texture_view/texsubimage-layers.c b/tests/spec/arb_texture_view/texsubimage-layers.c
index b1601be92..e7304e387 100644
--- a/tests/spec/arb_texture_view/texsubimage-layers.c
+++ b/tests/spec/arb_texture_view/texsubimage-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/texsubimage-levels.c b/tests/spec/arb_texture_view/texsubimage-levels.c
index 7bbaf7f8b..d98640924 100644
--- a/tests/spec/arb_texture_view/texsubimage-levels.c
+++ b/tests/spec/arb_texture_view/texsubimage-levels.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 15;
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/texture-immutable-levels.c b/tests/spec/arb_texture_view/texture-immutable-levels.c
index 7ce7924fb..670d43c8b 100644
--- a/tests/spec/arb_texture_view/texture-immutable-levels.c
+++ b/tests/spec/arb_texture_view/texture-immutable-levels.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 12;
config.supports_gl_es_version = 31;
+ 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
