[1/1] tests: enable intel_external_sampler_only and intel_unsupported_format for iris

Submitted by James Xiong on July 25, 2019, 5:30 p.m.

Details

Message ID 1564075816-13132-1-git-send-email-james.xiong@intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

James Xiong July 25, 2019, 5:30 p.m.
From: "Xiong, James" <james.xiong@intel.com>

Signed-off-by: Xiong, James <james.xiong@intel.com>
---
 tests/spec/ext_image_dma_buf_import/intel_external_sampler_only.c | 6 ++++--
 tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_only.c b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_only.c
index de1074c..e086a39 100644
--- a/tests/spec/ext_image_dma_buf_import/intel_external_sampler_only.c
+++ b/tests/spec/ext_image_dma_buf_import/intel_external_sampler_only.c
@@ -133,7 +133,8 @@  piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	static const char intel_id[] = "Intel Open Source Technology Center";
+	static const char iris_id[] = "Intel";
+	static const char i965_id[] = "Intel Open Source Technology Center";
 	const char *vendor_str;
 	EGLDisplay egl_dpy = eglGetCurrentDisplay();
 
@@ -143,7 +144,8 @@  piglit_init(int argc, char **argv)
 	piglit_require_extension("GL_OES_framebuffer_object");
 
 	vendor_str = (const char *)glGetString(GL_VENDOR);
-	if (strncmp(vendor_str, intel_id, sizeof(intel_id) - 1) != 0) {
+	if (strncmp(vendor_str, i965_id, sizeof(i965_id) - 1) != 0 &&
+	    strncmp(vendor_str, iris_id, sizeof(iris_id) - 1) != 0) {
 		printf("Test requires intel gpu\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c b/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
index 8373e90..3139cf3 100644
--- a/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
+++ b/tests/spec/ext_image_dma_buf_import/intel_unsupported_format.c
@@ -97,7 +97,8 @@  piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	static const char intel_id[] = "Intel Open Source Technology Center";
+        static const char iris_id[] = "Intel";
+        static const char i965_id[] = "Intel Open Source Technology Center";
 	const char *vendor_str;
 	EGLDisplay egl_dpy = eglGetCurrentDisplay();
 
@@ -106,7 +107,8 @@  piglit_init(int argc, char **argv)
 
 	vendor_str = (const char *)glGetString(GL_VENDOR);
 
-	if (strncmp(vendor_str, intel_id, sizeof(intel_id) - 1) != 0) {
+	if (strncmp(vendor_str, i965_id, sizeof(i965_id) - 1) != 0 &&
+	    strncmp(vendor_str, iris_id, sizeof(iris_id) - 1) != 0) {
 		printf("Test requires intel gpu\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}