glsl-1.50: set KHR_no_error status

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

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 b54e7c744..a670b562b 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 a8813302d..0e6709238 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 5d8f4ec94..26bc1840b 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 56723d986..545f49d0f 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 290f85fae..33bd2ab78 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 67a8475ff..b51796808 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 f7aed151d..534513f7b 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 fc9c0e6bc..b9cba9ded 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 790fdb722..c83f2fd41 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 13441d28e..88e88283b 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 3f4578bce..0c99cb13a 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 6f780929b..cfd71c944 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 c2b254aa2..327e7b16c 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 5dac18375..32e1756e0 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 64d78b946..61bd73e81 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 e11ed6c15..e93856ff2 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 9c5fd08e2..138f48bb7 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 dfe04d2bc..a58cd909f 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 79f0b0f40..d94d0c5f2 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 3f761476e..ed3d21372 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