[Piglit] [PATCH 10/10] glsl-1.50: set KHR_no_error status
Timothy Arceri
tarceri at itsqueeze.com
Wed Jul 5 05:23:44 UTC 2017
---
.../glsl-1.50/execution/geometry/end-primitive.c | 1 +
...ometry-end-primitive-optional-with-points-out.c | 1 +
.../execution/geometry/getshaderiv-may-return-GS.c | 1 +
.../execution/geometry/gs-emits-too-few-verts.c | 1 +
.../geometry/gs-input-layout-qualifiers.c | 1 +
.../execution/geometry/gs-max-output-components.c | 1 +
.../execution/geometry/gs-mismatch-prim-type.c | 1 +
.../geometry/gs-output-layout-qualifiers.c | 1 +
.../execution/geometry/primitive-id-restart.c | 1 +
.../glsl-1.50/execution/geometry/primitive-types.c | 1 +
.../execution/geometry/query-gs-prim-types.c | 41 ++++++++++++----------
.../geometry/transform-feedback-builtins.c | 1 +
.../geometry/transform-feedback-type-and-size.c | 1 +
.../geometry/transform-feedback-vertex-id.c | 1 +
.../tri-strip-ordering-with-prim-restart.c | 1 +
.../glsl-1.50/execution/get-active-attrib-array.c | 1 +
.../glsl-1.50/execution/interface-block-centroid.c | 1 +
.../interface-blocks-api-access-members.c | 1 +
tests/spec/glsl-1.50/execution/vs-input-arrays.c | 1 +
.../glsl-1.50/execution/vs-named-block-no-modify.c | 1 +
20 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/tests/spec/glsl-1.50/execution/geometry/end-primitive.c b/tests/spec/glsl-1.50/execution/geometry/end-primitive.c
index b54e7c7..a670b56 100644
--- a/tests/spec/glsl-1.50/execution/geometry/end-primitive.c
+++ b/tests/spec/glsl-1.50/execution/geometry/end-primitive.c
@@ -76,6 +76,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = 2*PATTERN_SIZE;
config.window_height = PATTERN_SIZE;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c b/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
index a881330..0e67092 100644
--- a/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
+++ b/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
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/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c b/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c
index 5d8f4ec..26bc184 100644
--- a/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c
+++ b/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
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/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c b/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c
index 56723d9..545f49d 100644
--- a/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c
+++ b/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
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/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
index 290f85f..33bd2ab 100644
--- a/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
+++ b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
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/glsl-1.50/execution/geometry/gs-max-output-components.c b/tests/spec/glsl-1.50/execution/geometry/gs-max-output-components.c
index 67a8475..b517968 100644
--- a/tests/spec/glsl-1.50/execution/geometry/gs-max-output-components.c
+++ b/tests/spec/glsl-1.50/execution/geometry/gs-max-output-components.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.window_width = 2*PATTERN_SIZE;
config.window_height = PATTERN_SIZE;
config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c b/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c
index f7aed15..534513f 100644
--- a/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c
+++ b/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c
@@ -50,6 +50,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_HAS_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
index fc9c0e6..b9cba9d 100644
--- a/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
+++ b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
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/glsl-1.50/execution/geometry/primitive-id-restart.c b/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c
index 790fdb7..c83f2fd 100644
--- a/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c
+++ b/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c
@@ -66,6 +66,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/geometry/primitive-types.c b/tests/spec/glsl-1.50/execution/geometry/primitive-types.c
index 13441d2..88e8828 100644
--- a/tests/spec/glsl-1.50/execution/geometry/primitive-types.c
+++ b/tests/spec/glsl-1.50/execution/geometry/primitive-types.c
@@ -49,6 +49,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c b/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c
index 3f4578b..0c99cb1 100644
--- a/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c
+++ b/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c
@@ -58,6 +58,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
@@ -148,30 +149,34 @@ piglit_init(int argc, char **argv)
glAttachShader(prog_no_gs, fs);
/* program not linked successfully yet should emit INVALID_OPERATION */
- glGetProgramiv(prog_no_gs, GL_GEOMETRY_INPUT_TYPE, &type);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ if (!piglit_khr_no_error) {
+ glGetProgramiv(prog_no_gs, GL_GEOMETRY_INPUT_TYPE, &type);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
- glGetProgramiv(prog_no_gs, GL_GEOMETRY_OUTPUT_TYPE, &type);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ glGetProgramiv(prog_no_gs, GL_GEOMETRY_OUTPUT_TYPE, &type);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
- glGetProgramiv(prog_no_gs, GL_GEOMETRY_VERTICES_OUT, &type);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ glGetProgramiv(prog_no_gs, GL_GEOMETRY_VERTICES_OUT, &type);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
- glLinkProgram(prog_no_gs);
- if(!piglit_link_check_status(prog_no_gs)){
- glDeleteProgram(prog_no_gs);
- piglit_report_result(PIGLIT_FAIL);
- }
+ glLinkProgram(prog_no_gs);
+ if(!piglit_link_check_status(prog_no_gs)){
+ glDeleteProgram(prog_no_gs);
+ piglit_report_result(PIGLIT_FAIL);
+ }
- /* program without a geometry shader should emit INVALID_OPERATION */
- glGetProgramiv(prog_no_gs, GL_GEOMETRY_INPUT_TYPE, &type);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ /* program without a geometry shader should emit
+ * INVALID_OPERATION
+ */
+ glGetProgramiv(prog_no_gs, GL_GEOMETRY_INPUT_TYPE, &type);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
- glGetProgramiv(prog_no_gs, GL_GEOMETRY_OUTPUT_TYPE, &type);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ glGetProgramiv(prog_no_gs, GL_GEOMETRY_OUTPUT_TYPE, &type);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
- glGetProgramiv(prog_no_gs, GL_GEOMETRY_VERTICES_OUT, &type);
- pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ glGetProgramiv(prog_no_gs, GL_GEOMETRY_VERTICES_OUT, &type);
+ pass = piglit_check_gl_error(GL_INVALID_OPERATION) & pass;
+ }
piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
}
diff --git a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-builtins.c b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-builtins.c
index 6f78092..cfd71c9 100644
--- a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-builtins.c
+++ b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-builtins.c
@@ -40,6 +40,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
#define NUM_OUTPUT_INTS 3
diff --git a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c
index c2b254a..327e7b1 100644
--- a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c
+++ b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c
@@ -51,6 +51,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
/**
diff --git a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c
index 5dac183..32e1756 100644
--- a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c
+++ b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
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/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c b/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c
index 64d78b9..61bd73e 100644
--- a/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c
+++ b/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c
@@ -64,6 +64,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
index e11ed6c..e93856f 100644
--- a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
+++ b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
@@ -32,6 +32,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/glsl-1.50/execution/interface-block-centroid.c b/tests/spec/glsl-1.50/execution/interface-block-centroid.c
index 9c5fd08..138f48b 100644
--- a/tests/spec/glsl-1.50/execution/interface-block-centroid.c
+++ b/tests/spec/glsl-1.50/execution/interface-block-centroid.c
@@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
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/glsl-1.50/execution/interface-blocks-api-access-members.c b/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c
index dfe04d2..a58cd90 100644
--- a/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c
+++ b/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_compat_version = 32;
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
diff --git a/tests/spec/glsl-1.50/execution/vs-input-arrays.c b/tests/spec/glsl-1.50/execution/vs-input-arrays.c
index 79f0b0f..d94d0c5 100644
--- a/tests/spec/glsl-1.50/execution/vs-input-arrays.c
+++ b/tests/spec/glsl-1.50/execution/vs-input-arrays.c
@@ -49,6 +49,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
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
static const char vs_text[] =
diff --git a/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c b/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
index 3f76147..ed3d213 100644
--- a/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
+++ b/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c
@@ -42,6 +42,7 @@
PIGLIT_GL_TEST_CONFIG_BEGIN
config.supports_gl_core_version = 32;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
PIGLIT_GL_TEST_CONFIG_END
--
2.9.4
More information about the Piglit
mailing list