[Piglit] [PATCH 08/50] ext_texture_swizzle: set KHR_no_error status

Samuel Pitoiset samuel.pitoiset at gmail.com
Thu Aug 10 15:22:08 UTC 2017


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 tests/spec/ext_texture_swizzle/api.c                         | 12 +++++++-----
 .../ext_texture_swizzle/depth_texture_mode_and_swizzle.c     |  1 +
 tests/spec/ext_texture_swizzle/swizzle.c                     |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/spec/ext_texture_swizzle/api.c b/tests/spec/ext_texture_swizzle/api.c
index 19486f278..3ead58e02 100644
--- a/tests/spec/ext_texture_swizzle/api.c
+++ b/tests/spec/ext_texture_swizzle/api.c
@@ -33,6 +33,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 12;
 	config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 
@@ -61,11 +62,12 @@ test_api(void)
 	static const GLint swz[4] = { GL_BLUE, GL_GREEN, GL_ALPHA, GL_ZERO };
 	GLint swzOut[4];
 
-	/* test bad param value */
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R_EXT, GL_RGBA);
-
-	if (!piglit_check_gl_error(GL_INVALID_ENUM))
-		return false;
+	if (!piglit_khr_no_error) {
+		/* test bad param value */
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R_EXT, GL_RGBA);
+		if (!piglit_check_gl_error(GL_INVALID_ENUM))
+			return false;
+	}
 
 	/* test good param values */
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R_EXT, GL_ONE);
diff --git a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c
index 47a85e03c..6f9d7f38c 100644
--- a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c
+++ b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c
@@ -46,6 +46,7 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
     config.window_width = 170;
     config.window_height= 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/ext_texture_swizzle/swizzle.c b/tests/spec/ext_texture_swizzle/swizzle.c
index 7a33e570a..063343be7 100644
--- a/tests/spec/ext_texture_swizzle/swizzle.c
+++ b/tests/spec/ext_texture_swizzle/swizzle.c
@@ -33,6 +33,7 @@
 PIGLIT_GL_TEST_CONFIG_BEGIN
 	config.supports_gl_compat_version = 12;
 	config.window_visual = PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
 PIGLIT_GL_TEST_CONFIG_END
 
 
-- 
2.14.0



More information about the Piglit mailing list