[Piglit] [PATCH 26/50] arb_texture_stencil8: set KHR_no_error status

[Samuel Pitoiset]

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 tests/spec/arb_texture_stencil8/draw.c            |  1 +
 tests/spec/arb_texture_stencil8/fbo-stencil8.c    |  1 +
 tests/spec/arb_texture_stencil8/getteximage.c     |  1 +
 tests/spec/arb_texture_stencil8/stencil-texture.c | 23 ++++++++++++++---------
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tests/spec/arb_texture_stencil8/draw.c b/tests/spec/arb_texture_stencil8/draw.c
index 82c5bc0f4..244ffcf8d 100644
--- a/tests/spec/arb_texture_stencil8/draw.c
+++ b/tests/spec/arb_texture_stencil8/draw.c
@@ -55,6 +55,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;
 	config.window_width = 256 + 3;
 	config.window_height = 256 * 2 + 3;
 
diff --git a/tests/spec/arb_texture_stencil8/fbo-stencil8.c b/tests/spec/arb_texture_stencil8/fbo-stencil8.c
index 13e07f521..8e3fad8b8 100644
--- a/tests/spec/arb_texture_stencil8/fbo-stencil8.c
+++ b/tests/spec/arb_texture_stencil8/fbo-stencil8.c
@@ -38,6 +38,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_core_version = 32;
 
 	config.window_visual = PIGLIT_GL_VISUAL_DOUBLE;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
diff --git a/tests/spec/arb_texture_stencil8/getteximage.c b/tests/spec/arb_texture_stencil8/getteximage.c
index 09e81de63..87d338930 100644
--- a/tests/spec/arb_texture_stencil8/getteximage.c
+++ b/tests/spec/arb_texture_stencil8/getteximage.c
@@ -32,6 +32,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 12;
 	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_stencil8/stencil-texture.c b/tests/spec/arb_texture_stencil8/stencil-texture.c
index 8936a9152..7db66c400 100644
--- a/tests/spec/arb_texture_stencil8/stencil-texture.c
+++ b/tests/spec/arb_texture_stencil8/stencil-texture.c
@@ -35,6 +35,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_core_version = 31;
 
 	config.window_visual = PIGLIT_GL_VISUAL_RGBA;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 
 PIGLIT_GL_TEST_CONFIG_END
 
@@ -64,12 +65,14 @@ try_TexImage(GLenum internalFormat)
 		     GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, NULL);
 	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
 
-	/* 3D texture is not in the list of supported STENCIL_INDEX */
-	glBindTexture(GL_TEXTURE_3D, tex[2]);
-	glTexImage3D(GL_TEXTURE_3D, 0, internalFormat,
-		     8, 8, 8, 0,
-		     GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, NULL);
-	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+	if (!piglit_khr_no_error) {
+		/* 3D texture is not in the list of supported STENCIL_INDEX */
+		glBindTexture(GL_TEXTURE_3D, tex[2]);
+		glTexImage3D(GL_TEXTURE_3D, 0, internalFormat,
+			     8, 8, 8, 0,
+			     GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, NULL);
+		pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+	}
 
 	glBindTexture(GL_TEXTURE_CUBE_MAP, tex[3]);
 
@@ -137,9 +140,11 @@ try_TexStorage(GLenum internalFormat)
 	glTexStorage2D(GL_TEXTURE_2D, 1, internalFormat, 16, 16);
 	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
 
-	glBindTexture(GL_TEXTURE_3D, tex[2]);
-	glTexStorage3D(GL_TEXTURE_3D, 1, internalFormat, 8, 8, 8);
-	pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+	if (!piglit_khr_no_error) {
+		glBindTexture(GL_TEXTURE_3D, tex[2]);
+		glTexStorage3D(GL_TEXTURE_3D, 1, internalFormat, 8, 8, 8);
+		pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
+	}
 
 	glBindTexture(GL_TEXTURE_CUBE_MAP, tex[3]);
 	glTexStorage2D(GL_TEXTURE_CUBE_MAP, 1, internalFormat, 16, 16);
-- 
2.14.0