[Piglit] [PATCH] piglit-framework-gl: skip compat test when not supported

Timothy Arceri tarceri at itsqueeze.com
Tue May 1 06:22:40 UTC 2018


OpenGL 3.1 is a little special when it comes to compatibility. If
a 3.1 compat profile is requested by piglit and ARB_compatibility
not supported waffle will end up creating a core profile for us.

Here we make sure ARB_compatibility is supported when explicitly
requesting a 3.1 compat profile from piglit. This allows us to
avoid testing for ARB_compatibility in all GL 3.1 compat tests.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106277
---
 tests/util/piglit-framework-gl/piglit_wfl_framework.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
index c5f6d4113..5f00c7ed6 100644
--- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c
+++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c
@@ -565,8 +565,15 @@ make_context_current(struct piglit_wfl_framework *wfl_fw,
 		ok = make_context_current_singlepass(wfl_fw, test_config,
 		                                     CONTEXT_GL_COMPAT,
 		                                     partial_config_attrib_list);
-		if (ok)
-		   return;
+		if (ok) {
+			if (test_config->supports_gl_compat_version == 31 &&
+			    !piglit_is_extension_supported("GL_ARB_compatibility")) {
+				printf("piglit: info: Failed to create a compat profile\n");
+				piglit_report_result(PIGLIT_SKIP);
+			}
+
+			return;
+		}
 	}
 
 #elif defined(PIGLIT_USE_OPENGL_ES1) || \
-- 
2.17.0



More information about the Piglit mailing list