diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2018-05-01 15:56:30 +1000 |
|---|---|---|
| committer | Timothy Arceri <tarceri@itsqueeze.com> | 2018-05-03 12:15:40 +1000 |
| commit | f74d92e704849610364b4474a2c67ea2008c14e0 (patch) | |
| tree | 5117b9a66d8e8149cce08bc4ac49126b89766aad | |
| parent | 69a0d9192f52570211df74a12265c5d2b0721542 (diff) | |
piglit-framework-gl: skip compat test when not supported
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
| -rw-r--r-- | tests/util/piglit-framework-gl/piglit_wfl_framework.c | 11 |
1 files 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) || \ |