texturing: set KHR_no_error status

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

67 files changed, 119 insertions, 48 deletions

diff --git a/tests/texturing/1-1-linear-texture.c b/tests/texturing/1-1-linear-texture.c
index acaa818a7..498945d6e 100644
--- a/tests/texturing/1-1-linear-texture.c
+++ b/tests/texturing/1-1-linear-texture.c
@@ -36,6 +36,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
 
diff --git a/tests/texturing/array-depth-roundtrip.c b/tests/texturing/array-depth-roundtrip.c
index e40c88006..0118b2510 100644
--- a/tests/texturing/array-depth-roundtrip.c
+++ b/tests/texturing/array-depth-roundtrip.c
@@ -59,6 +59,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = TEX_WIDTH*NUM_TILES_ACROSS;
 	config.window_height = TEX_HEIGHT*NUM_TILES_DOWN;
 	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/texturing/array-texture.c b/tests/texturing/array-texture.c
index f84116b03..17b250451 100644
--- a/tests/texturing/array-texture.c
+++ b/tests/texturing/array-texture.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 700;
 	config.window_height = 400;
 	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/texturing/copyteximage-border.c b/tests/texturing/copyteximage-border.c
index bdc08773f..22f8ef266 100644
--- a/tests/texturing/copyteximage-border.c
+++ b/tests/texturing/copyteximage-border.c
@@ -39,6 +39,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = TEX_SIZE*2+30;
 	config.window_height = TEX_SIZE+20;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/copyteximage-clipping.c b/tests/texturing/copyteximage-clipping.c
index 9089fb199..294adb80c 100644
--- a/tests/texturing/copyteximage-clipping.c
+++ b/tests/texturing/copyteximage-clipping.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/copytexsubimage.c b/tests/texturing/copytexsubimage.c
index cb3c40f54..766b10e4c 100644
--- a/tests/texturing/copytexsubimage.c
+++ b/tests/texturing/copytexsubimage.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 200;
 	config.window_height = 200;
 	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/texturing/crossbar.c b/tests/texturing/crossbar.c
index e10908b53..d63c1ef70 100644
--- a/tests/texturing/crossbar.c
+++ b/tests/texturing/crossbar.c
@@ -62,6 +62,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 100*(NUM_TESTS+1);
 	config.window_height = 100;
 	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/texturing/cubemap-getteximage-pbo.c b/tests/texturing/cubemap-getteximage-pbo.c
index d16b3b88b..6efd4a61b 100644
--- a/tests/texturing/cubemap-getteximage-pbo.c
+++ b/tests/texturing/cubemap-getteximage-pbo.c
@@ -35,6 +35,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/texturing/cubemap-mismatch.c b/tests/texturing/cubemap-mismatch.c
index 808ec25fc..517d5993f 100644
--- a/tests/texturing/cubemap-mismatch.c
+++ b/tests/texturing/cubemap-mismatch.c
@@ -37,6 +37,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 
diff --git a/tests/texturing/cubemap-shader.c b/tests/texturing/cubemap-shader.c
index fd1e2826b..c5870334c 100644
--- a/tests/texturing/cubemap-shader.c
+++ b/tests/texturing/cubemap-shader.c
@@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = (64*6+PAD*9)*2;
 	config.window_height = 200;
 	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/texturing/cubemap.c b/tests/texturing/cubemap.c
index 9e7b80760..8fea1cd5b 100644
--- a/tests/texturing/cubemap.c
+++ b/tests/texturing/cubemap.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = (64*6+PAD*9)*2;
 	config.window_height = 400;
 	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/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c
index e8644878f..77598e2af 100644
--- a/tests/texturing/depth-level-clamp.c
+++ b/tests/texturing/depth-level-clamp.c
@@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = (MAX_SIZE*2+PAD*3);
 	config.window_height = (MAX_SIZE*MAX_LOD+PAD*(MAX_LOD+1));
 	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/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c
index f032f8451..d69d18de8 100644
--- a/tests/texturing/depth-tex-compare.c
+++ b/tests/texturing/depth-tex-compare.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 400;
 	config.window_height = 300;
 	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/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c
index ccdf5ef5c..a6f16689f 100644
--- a/tests/texturing/depth-tex-modes-glsl.c
+++ b/tests/texturing/depth-tex-modes-glsl.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 400;
 	config.window_height = 300;
 	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/texturing/depth-tex-modes-rg.c b/tests/texturing/depth-tex-modes-rg.c
index 9b1dcfbdc..92727e1b6 100644
--- a/tests/texturing/depth-tex-modes-rg.c
+++ b/tests/texturing/depth-tex-modes-rg.c
@@ -50,6 +50,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = MAX2(TEST_WIDTH, config.window_width);
 	config.window_height = MAX2(TEST_HEIGHT, config.window_height);
 	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/texturing/depth-tex-modes.c b/tests/texturing/depth-tex-modes.c
index ce7ed503a..7c2fd73c0 100644
--- a/tests/texturing/depth-tex-modes.c
+++ b/tests/texturing/depth-tex-modes.c
@@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 1+(TEST_COLS*(BOX_SIZE+1));
 	config.window_height = 1+(TEST_ROWS*(BOX_SIZE+1));
 	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/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c
index e859c435e..a047ee261 100644
--- a/tests/texturing/fragment-and-vertex-texturing.c
+++ b/tests/texturing/fragment-and-vertex-texturing.c
@@ -37,6 +37,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
 
diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c
index bf4d4d8c5..6a09e036a 100644
--- a/tests/texturing/fxt1-teximage.c
+++ b/tests/texturing/fxt1-teximage.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 300;
 	config.window_height = 300;
 	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/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c
index c9393bf59..ec307e30c 100644
--- a/tests/texturing/gen-compressed-teximage.c
+++ b/tests/texturing/gen-compressed-teximage.c
@@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 512;
 	config.window_height = 512;
 	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/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c
index 5b625008b..cfb017a9a 100644
--- a/tests/texturing/gen-nonzero-unit.c
+++ b/tests/texturing/gen-nonzero-unit.c
@@ -48,6 +48,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 512;
 	config.window_height = 512;
 	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/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c
index 4827c8540..996681f34 100644
--- a/tests/texturing/gen-teximage.c
+++ b/tests/texturing/gen-teximage.c
@@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 512;
 	config.window_height = 512;
 	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/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c
index b7a6a5afc..facf83e63 100644
--- a/tests/texturing/gen-texsubimage.c
+++ b/tests/texturing/gen-texsubimage.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 512;
 	config.window_height = 512;
 	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/texturing/generatemipmap-base-change.c b/tests/texturing/generatemipmap-base-change.c
index 92ee90881..e550a754a 100644
--- a/tests/texturing/generatemipmap-base-change.c
+++ b/tests/texturing/generatemipmap-base-change.c
@@ -36,6 +36,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
 
 
diff --git a/tests/texturing/generatemipmap-cubemap.c b/tests/texturing/generatemipmap-cubemap.c
index bb88b48ae..cadf14047 100644
--- a/tests/texturing/generatemipmap-cubemap.c
+++ b/tests/texturing/generatemipmap-cubemap.c
@@ -39,6 +39,7 @@ 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/texturing/getteximage-depth.c b/tests/texturing/getteximage-depth.c
index bc79466c4..0031a3678 100644
--- a/tests/texturing/getteximage-depth.c
+++ b/tests/texturing/getteximage-depth.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c
index 02d78d441..bbd883248 100644
--- a/tests/texturing/getteximage-formats.c
+++ b/tests/texturing/getteximage-formats.c
@@ -42,6 +42,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 600;
 	config.window_height = 200;
 	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/texturing/getteximage-luminance.c b/tests/texturing/getteximage-luminance.c
index 6d28b4c29..79a2fbdf4 100644
--- a/tests/texturing/getteximage-luminance.c
+++ b/tests/texturing/getteximage-luminance.c
@@ -35,6 +35,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
 
diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c
index 0befc78d8..273f2b36c 100644
--- a/tests/texturing/getteximage-simple.c
+++ b/tests/texturing/getteximage-simple.c
@@ -17,6 +17,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
 
diff --git a/tests/texturing/getteximage-targets.c b/tests/texturing/getteximage-targets.c
index 3d1dfaad6..ed61ad209 100644
--- a/tests/texturing/getteximage-targets.c
+++ b/tests/texturing/getteximage-targets.c
@@ -29,6 +29,7 @@ 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/texturing/incomplete-cubemap.c b/tests/texturing/incomplete-cubemap.c
index 40031b3c2..1a017c315 100644
--- a/tests/texturing/incomplete-cubemap.c
+++ b/tests/texturing/incomplete-cubemap.c
@@ -34,6 +34,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_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/incomplete-texture.c b/tests/texturing/incomplete-texture.c
index 8b97c4c7d..7731e09e0 100644
--- a/tests/texturing/incomplete-texture.c
+++ b/tests/texturing/incomplete-texture.c
@@ -36,6 +36,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
 
diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c
index bb769850a..1a9b5f570 100644
--- a/tests/texturing/levelclamp.c
+++ b/tests/texturing/levelclamp.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 500;
 	config.window_height = 600;
 	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/texturing/lodbias.c b/tests/texturing/lodbias.c
index 83cb031fc..79af9b811 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -51,6 +51,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 3*SquareSize;
 	config.window_height = 3*SquareSize;
 	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/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c
index 09694c08c..6ddb71fd8 100644
--- a/tests/texturing/lodclamp-between-max.c
+++ b/tests/texturing/lodclamp-between-max.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c
index fe5736753..0d00bfb7f 100644
--- a/tests/texturing/lodclamp-between.c
+++ b/tests/texturing/lodclamp-between.c
@@ -45,6 +45,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 200;
 	config.window_height = 200;
 	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/texturing/lodclamp.c b/tests/texturing/lodclamp.c
index a5ee4751b..9b7b6eeeb 100644
--- a/tests/texturing/lodclamp.c
+++ b/tests/texturing/lodclamp.c
@@ -43,6 +43,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 500;
 	config.window_height = 600;
 	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/texturing/max-samplers.c b/tests/texturing/max-samplers.c
index 52d0a2ceb..0fc5bd91b 100644
--- a/tests/texturing/max-samplers.c
+++ b/tests/texturing/max-samplers.c
@@ -37,6 +37,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 300;
 	config.window_height = 300;
 	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/texturing/max-texture-size-level.c b/tests/texturing/max-texture-size-level.c
index 23a7b8384..8f90c0833 100644
--- a/tests/texturing/max-texture-size-level.c
+++ b/tests/texturing/max-texture-size-level.c
@@ -43,6 +43,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
 enum piglit_result
@@ -84,31 +85,33 @@ piglit_init(int argc, char **argv)
 		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
 
-        /*
-         * For level 1, maxSize by 1 (and vice versa) should fail.
-	 */
-	glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA,
-		     maxSize, 1, 0,
-		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
-
-	glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA,
-		     1, maxSize, 0,
-		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
-
-        /*
-         * For level 2, maxSize/2 by 1 (and vice versa) should fail.
-         */
-	glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA,
-		     maxSize/2, 1, 0,
-		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
-
-	glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA,
-		     1, maxSize/2, 0,
-		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
+	if (!piglit_khr_no_error) {
+		/*
+		 * For level 1, maxSize by 1 (and vice versa) should fail.
+		 */
+		glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA,
+			     maxSize, 1, 0,
+			     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
+
+		glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA,
+			     1, maxSize, 0,
+			     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
+
+		/*
+		 * For level 2, maxSize/2 by 1 (and vice versa) should fail.
+		 */
+		glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA,
+			     maxSize/2, 1, 0,
+			     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
+
+		glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA,
+			     1, maxSize/2, 0,
+			     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) & pass;
+	}
 
 	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
 }
diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c
index 4c5cee55b..bb5ba9bb1 100644
--- a/tests/texturing/mipmap-setup.c
+++ b/tests/texturing/mipmap-setup.c
@@ -40,6 +40,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 200;
 	config.window_height = 200;
 	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/texturing/proxy-texture.c b/tests/texturing/proxy-texture.c
index 6a4d0228e..573afcc10 100644
--- a/tests/texturing/proxy-texture.c
+++ b/tests/texturing/proxy-texture.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	config.window_visual = PIGLIT_GL_VISUAL_RGB;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -92,29 +93,31 @@ do_proxy_tests(void)
 
 	init_proxy_texture();
 
-	/* bad level => GL_INVALID_VALUE */
-	glTexImage2D(GL_PROXY_TEXTURE_2D, 5555, GL_RGBA, 8, 8, 0,
-		     GL_RGBA, GL_FLOAT, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
-	pass = check_no_proxy_change() && pass;
-
-	/* bad width => GL_INVALID_VALUE */
-	glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, -8, 8, 0,
-		     GL_RGBA, GL_FLOAT, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
-	pass = check_no_proxy_change() && pass;
-
-	/* bad border => GL_INVALID_VALUE */
-	glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, 8, 8, 2,
-		     GL_RGBA, GL_FLOAT, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
-	pass = check_no_proxy_change() && pass;
-
-	/* bad format+type => GL_INVALID_OPERATION */
-	glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0,
-		     GL_DEPTH_COMPONENT, GL_UNSIGNED_INT_8_8_8_8, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
-	pass = check_no_proxy_change() && pass;
+	if (!piglit_khr_no_error) {
+		/* bad level => GL_INVALID_VALUE */
+		glTexImage2D(GL_PROXY_TEXTURE_2D, 5555, GL_RGBA, 8, 8, 0,
+			     GL_RGBA, GL_FLOAT, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+		pass = check_no_proxy_change() && pass;
+
+		/* bad width => GL_INVALID_VALUE */
+		glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, -8, 8, 0,
+			     GL_RGBA, GL_FLOAT, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+		pass = check_no_proxy_change() && pass;
+
+		/* bad border => GL_INVALID_VALUE */
+		glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, 8, 8, 2,
+			     GL_RGBA, GL_FLOAT, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+		pass = check_no_proxy_change() && pass;
+
+		/* bad format+type => GL_INVALID_OPERATION */
+		glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0,
+			     GL_DEPTH_COMPONENT, GL_UNSIGNED_INT_8_8_8_8, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+		pass = check_no_proxy_change() && pass;
+	}
 
 	/* Test real proxy behaviour here.  Use too big width, height.
 	 * This should not generate a GL error but it should zero-out the
diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c
index efc89513a..03019adad 100644
--- a/tests/texturing/rg-draw-pixels.c
+++ b/tests/texturing/rg-draw-pixels.c
@@ -35,6 +35,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
 
diff --git a/tests/texturing/rg-teximage-01.c b/tests/texturing/rg-teximage-01.c
index 72632eb2f..5ac825aa0 100644
--- a/tests/texturing/rg-teximage-01.c
+++ b/tests/texturing/rg-teximage-01.c
@@ -57,6 +57,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = WIDTH*Elements(tex);
 	config.window_height = HEIGHT;
 	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/texturing/rg-teximage-02.c b/tests/texturing/rg-teximage-02.c
index 28746beb0..bd3f29961 100644
--- a/tests/texturing/rg-teximage-02.c
+++ b/tests/texturing/rg-teximage-02.c
@@ -57,6 +57,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = WIDTH*Elements(tex);
 	config.window_height = HEIGHT;
 	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/texturing/rgtc-teximage-01.c b/tests/texturing/rgtc-teximage-01.c
index 5a91c72b6..9ce08c18c 100644
--- a/tests/texturing/rgtc-teximage-01.c
+++ b/tests/texturing/rgtc-teximage-01.c
@@ -58,6 +58,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = WIDTH*Elements(tex);
 	config.window_height = HEIGHT;
 	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/texturing/rgtc-teximage-02.c b/tests/texturing/rgtc-teximage-02.c
index 255f34bec..d6811441d 100644
--- a/tests/texturing/rgtc-teximage-02.c
+++ b/tests/texturing/rgtc-teximage-02.c
@@ -58,6 +58,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = WIDTH*Elements(tex);
 	config.window_height = HEIGHT;
 	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/texturing/s3tc-errors.c b/tests/texturing/s3tc-errors.c
index 659cfe1bd..81fee3e21 100644
--- a/tests/texturing/s3tc-errors.c
+++ b/tests/texturing/s3tc-errors.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.window_width = 200;
     config.window_height = 200;
     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/texturing/s3tc-targeted.c b/tests/texturing/s3tc-targeted.c
index 179ea27af..ef0eaf5eb 100644
--- a/tests/texturing/s3tc-targeted.c
+++ b/tests/texturing/s3tc-targeted.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	/* We need OpenGL 1.3 for the *TexImage* functions used in this file. */
 	config.supports_gl_compat_version = 13;
 	config.requires_displayed_window = false;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c
index 6256c0acd..07e04f729 100644
--- a/tests/texturing/s3tc-teximage.c
+++ b/tests/texturing/s3tc-teximage.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 500;
 	config.window_height = 600;
 	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/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c
index ddb9a98c1..17d739a39 100644
--- a/tests/texturing/s3tc-texsubimage.c
+++ b/tests/texturing/s3tc-texsubimage.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 500;
 	config.window_height = 600;
 	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/texturing/sampler-cube-shadow.c b/tests/texturing/sampler-cube-shadow.c
index 2702c057f..d47384f62 100644
--- a/tests/texturing/sampler-cube-shadow.c
+++ b/tests/texturing/sampler-cube-shadow.c
@@ -41,6 +41,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 400;
 	config.window_height = 300;
 	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/texturing/sized-texture-format-channels.c b/tests/texturing/sized-texture-format-channels.c
index a8a78e030..ee757e1af 100644
--- a/tests/texturing/sized-texture-format-channels.c
+++ b/tests/texturing/sized-texture-format-channels.c
@@ -53,6 +53,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+	config.khr_no_error_support = PIGLIT_HAS_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c
index 202bbe075..5f5466d9c 100644
--- a/tests/texturing/streaming-texture-leak.c
+++ b/tests/texturing/streaming-texture-leak.c
@@ -43,6 +43,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
 
diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c
index b0ea81e21..13ba84eaf 100644
--- a/tests/texturing/tex-border-1.c
+++ b/tests/texturing/tex-border-1.c
@@ -44,6 +44,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
 
diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c
index 959bab2ea..80f0a7e26 100644
--- a/tests/texturing/tex-miplevel-selection.c
+++ b/tests/texturing/tex-miplevel-selection.c
@@ -63,6 +63,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 900;
 	config.window_height = 600;
 	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/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c
index 2c706d51c..fa15ef665 100644
--- a/tests/texturing/tex-srgb.c
+++ b/tests/texturing/tex-srgb.c
@@ -37,6 +37,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
 
diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c
index b312edb77..e62b5766d 100644
--- a/tests/texturing/tex3d-npot.c
+++ b/tests/texturing/tex3d-npot.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/tex3d.c b/tests/texturing/tex3d.c
index bac8eefdd..0006a6b1a 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -33,6 +33,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/texdepth.c b/tests/texturing/texdepth.c
index 43c889c13..fc4be15a3 100644
--- a/tests/texturing/texdepth.c
+++ b/tests/texturing/texdepth.c
@@ -21,6 +21,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = COLS*32;
 	config.window_height = ROWS*32;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index 3f34a25b8..c72c5f64d 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -15,6 +15,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 16*16;
 	config.window_height = 11*16;
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c
index 65754b02e..44c62b313 100644
--- a/tests/texturing/texredefine.c
+++ b/tests/texturing/texredefine.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/texsubimage-depth-formats.c b/tests/texturing/texsubimage-depth-formats.c
index ead281167..4dadd7700 100644
--- a/tests/texturing/texsubimage-depth-formats.c
+++ b/tests/texturing/texsubimage-depth-formats.c
@@ -32,6 +32,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
 
diff --git a/tests/texturing/texsubimage-unpack.c b/tests/texturing/texsubimage-unpack.c
index 45dddbb92..06bfb9613 100644
--- a/tests/texturing/texsubimage-unpack.c
+++ b/tests/texturing/texsubimage-unpack.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 	config.window_width = 512;
 	config.window_height = 512;
diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c
index 7a86d4270..870afb6d8 100644
--- a/tests/texturing/texture-al.c
+++ b/tests/texturing/texture-al.c
@@ -36,6 +36,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c
index 87da808bf..2a9c0b35d 100644
--- a/tests/texturing/texture-packed-formats.c
+++ b/tests/texturing/texture-packed-formats.c
@@ -46,6 +46,7 @@ config.supports_gl_compat_version = 10;
 config.window_width = 700;
 config.window_height = 620;
 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/texturing/texture-rg.c b/tests/texturing/texture-rg.c
index d592ca21d..911e6938a 100644
--- a/tests/texturing/texture-rg.c
+++ b/tests/texturing/texture-rg.c
@@ -34,6 +34,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 10;
 
 	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/texturing/texwrap.c b/tests/texturing/texwrap.c
index e10e6eca9..c41e3f586 100644
--- a/tests/texturing/texwrap.c
+++ b/tests/texturing/texwrap.c
@@ -594,6 +594,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.window_width = 872;
 	config.window_height = 230;
 	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/texturing/zero-tex-coord.c b/tests/texturing/zero-tex-coord.c
index dbbc260b1..98f3629b9 100644
--- a/tests/texturing/zero-tex-coord.c
+++ b/tests/texturing/zero-tex-coord.c
@@ -41,6 +41,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_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END