tests/all.py: GLX tests can run on the 'mixed_glx_egl' platform

Which is the default platform on Linux.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dylan Baker <dylanx.c.baker@intel.com>

1 files changed, 89 insertions, 89 deletions

diff --git a/tests/all.py b/tests/all.py
index 5462f8d12..578c9a076 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -516,112 +516,112 @@ def add_vpfpgeneric(group, name):
         run_concurrent=True)
 
 glx = {}
-add_msaa_visual_plain_tests(glx, 'glx-copy-sub-buffer', require_platforms=['glx'])
-glx['glx-destroycontext-1'] = PiglitGLTest('glx-destroycontext-1', require_platforms=['glx'])
-glx['glx-destroycontext-2'] = PiglitGLTest('glx-destroycontext-2', require_platforms=['glx'])
-glx['glx-dont-care-mask'] = PiglitGLTest('glx-dont-care-mask', require_platforms=['glx'])
-glx['glx-close-display'] = PiglitGLTest('glx-close-display', require_platforms=['glx'])
-glx['glx-fbconfig-sanity'] = PiglitGLTest('glx-fbconfig-sanity', run_concurrent=True, require_platforms=['glx'])
-glx['glx-fbconfig-compliance'] = PiglitGLTest('glx-fbconfig-compliance', run_concurrent=True, require_platforms=['glx'])
-glx['glx-fbo-binding'] = PiglitGLTest('glx-fbo-binding', require_platforms=['glx'])
-glx['glx-multi-context-ib-1'] = PiglitGLTest('glx-multi-context-ib-1', require_platforms=['glx'])
-glx['glx-multithread'] = PiglitGLTest('glx-multithread', require_platforms=['glx'])
-glx['glx-multithread-texture'] = PiglitGLTest('glx-multithread-texture', require_platforms=['glx'])
-glx['glx-multithread-makecurrent-1'] = PiglitGLTest('glx-multithread-makecurrent-1', require_platforms=['glx'])
-glx['glx-multithread-makecurrent-2'] = PiglitGLTest('glx-multithread-makecurrent-2', require_platforms=['glx'])
-glx['glx-multithread-makecurrent-3'] = PiglitGLTest('glx-multithread-makecurrent-3', require_platforms=['glx'])
-glx['glx-multithread-makecurrent-4'] = PiglitGLTest('glx-multithread-makecurrent-4', require_platforms=['glx'])
-glx['glx-multithread-shader-compile'] = PiglitGLTest('glx-multithread-shader-compile', run_concurrent=True, require_platforms=['glx'])
-glx['glx-shader-sharing'] = PiglitGLTest('glx-shader-sharing', require_platforms=['glx'])
-glx['glx-swap-exchange'] = PiglitGLTest('glx-swap-exchange', require_platforms=['glx'])
-glx['glx-swap-event_event'] = PiglitGLTest('glx-swap-event --event', require_platforms=['glx'])
-glx['glx-swap-event_async'] = PiglitGLTest('glx-swap-event --async', require_platforms=['glx'])
-glx['glx-swap-event_interval'] = PiglitGLTest('glx-swap-event --interval', require_platforms=['glx'])
-glx['glx-swap-pixmap'] = PiglitGLTest('glx-swap-pixmap', require_platforms=['glx'])
-glx['glx-swap-pixmap-bad'] = PiglitGLTest('glx-swap-pixmap-bad', require_platforms=['glx'])
-glx['glx-swap-singlebuffer'] = PiglitGLTest('glx-swap-singlebuffer', require_platforms=['glx'])
-glx['glx-make-current'] = PiglitGLTest('glx-make-current', require_platforms=['glx'])
-glx['glx-make-glxdrawable-current'] = PiglitGLTest('glx-make-glxdrawable-current', require_platforms=['glx'])
-glx['glx-buffer-age'] = PiglitGLTest('glx-buffer-age', require_platforms=['glx'])
-glx['glx-buffer-age vblank_mode=0'] = PiglitGLTest('glx-buffer-age', require_platforms=['glx'])
+add_msaa_visual_plain_tests(glx, 'glx-copy-sub-buffer', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-destroycontext-1'] = PiglitGLTest('glx-destroycontext-1', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-destroycontext-2'] = PiglitGLTest('glx-destroycontext-2', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-dont-care-mask'] = PiglitGLTest('glx-dont-care-mask', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-close-display'] = PiglitGLTest('glx-close-display', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-fbconfig-sanity'] = PiglitGLTest('glx-fbconfig-sanity', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-fbconfig-compliance'] = PiglitGLTest('glx-fbconfig-compliance', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-fbo-binding'] = PiglitGLTest('glx-fbo-binding', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multi-context-ib-1'] = PiglitGLTest('glx-multi-context-ib-1', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread'] = PiglitGLTest('glx-multithread', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread-texture'] = PiglitGLTest('glx-multithread-texture', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread-makecurrent-1'] = PiglitGLTest('glx-multithread-makecurrent-1', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread-makecurrent-2'] = PiglitGLTest('glx-multithread-makecurrent-2', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread-makecurrent-3'] = PiglitGLTest('glx-multithread-makecurrent-3', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread-makecurrent-4'] = PiglitGLTest('glx-multithread-makecurrent-4', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-multithread-shader-compile'] = PiglitGLTest('glx-multithread-shader-compile', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-shader-sharing'] = PiglitGLTest('glx-shader-sharing', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-exchange'] = PiglitGLTest('glx-swap-exchange', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-event_event'] = PiglitGLTest('glx-swap-event --event', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-event_async'] = PiglitGLTest('glx-swap-event --async', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-event_interval'] = PiglitGLTest('glx-swap-event --interval', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-pixmap'] = PiglitGLTest('glx-swap-pixmap', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-pixmap-bad'] = PiglitGLTest('glx-swap-pixmap-bad', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-swap-singlebuffer'] = PiglitGLTest('glx-swap-singlebuffer', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-make-current'] = PiglitGLTest('glx-make-current', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-make-glxdrawable-current'] = PiglitGLTest('glx-make-glxdrawable-current', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-buffer-age'] = PiglitGLTest('glx-buffer-age', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-buffer-age vblank_mode=0'] = PiglitGLTest('glx-buffer-age', require_platforms=['glx', 'mixed_glx_egl'])
 glx['glx-buffer-age vblank_mode=0'].env['vblank_mode'] = '0'
-glx['glx-pixmap-life'] = PiglitGLTest('glx-pixmap-life', run_concurrent=True, require_platforms=['glx'])
-glx['glx-pixmap13-life'] = PiglitGLTest('glx-pixmap13-life', run_concurrent=True, require_platforms=['glx'])
-glx['glx-pixmap-multi'] = PiglitGLTest('glx-pixmap-multi', run_concurrent=True, require_platforms=['glx'])
-glx['glx-tfp'] = PiglitGLTest('glx-tfp', require_platforms=['glx'])
-glx['glx-visuals-depth'] = PiglitGLTest('glx-visuals-depth', require_platforms=['glx'])
-glx['glx-visuals-depth -pixmap'] = PiglitGLTest('glx-visuals-depth', run_concurrent=True, require_platforms=['glx'])
-glx['glx-visuals-stencil'] = PiglitGLTest('glx-visuals-stencil', require_platforms=['glx'])
-glx['glx-visuals-stencil -pixmap'] = PiglitGLTest('glx-visuals-stencil', run_concurrent=True, require_platforms=['glx'])
-glx['glx-window-life'] = PiglitGLTest('glx-window-life', run_concurrent=True, require_platforms=['glx'])
-glx['glx-pixmap-crosscheck'] = PiglitGLTest('glx-pixmap-crosscheck', run_concurrent=True, require_platforms=['glx'])
-glx['glx-query-drawable-GLXWINDOW-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXWINDOW', require_platforms=['glx'])
-glx['glx-query-drawable-GLXWINDOW-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXWINDOW', require_platforms=['glx'])
-glx['glx-query-drawable-GLXPIXMAP-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPIXMAP', require_platforms=['glx'])
-glx['glx-query-drawable-GLXPIXMAP-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPIXMAP', require_platforms=['glx'])
-glx['glx-query-drawable-GLXPBUFFER-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPBUFFER', require_platforms=['glx'])
-glx['glx-query-drawable-GLXPBUFFER-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPBUFFER', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=WINDOW', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=WINDOW', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_FBCONFIG_ID-WINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=WINDOW', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXWINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXWINDOW', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPIXMAP'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPIXMAP', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPBUFFER'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER', require_platforms=['glx'])
-glx['glx-query-drawable-GLX_PRESERVED_CONTENTS'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER', require_platforms=['glx'])
-glx['glx-query-drawable-GLXBadDrawable'] = PiglitGLTest('glx-query-drawable --bad-drawable', require_platforms=['glx'])
-glx['extension string sanity'] = PiglitGLTest('glx-string-sanity', run_concurrent=True, require_platforms=['glx'])
+glx['glx-pixmap-life'] = PiglitGLTest('glx-pixmap-life', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-pixmap13-life'] = PiglitGLTest('glx-pixmap13-life', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-pixmap-multi'] = PiglitGLTest('glx-pixmap-multi', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-tfp'] = PiglitGLTest('glx-tfp', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-visuals-depth'] = PiglitGLTest('glx-visuals-depth', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-visuals-depth -pixmap'] = PiglitGLTest('glx-visuals-depth', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-visuals-stencil'] = PiglitGLTest('glx-visuals-stencil', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-visuals-stencil -pixmap'] = PiglitGLTest('glx-visuals-stencil', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-window-life'] = PiglitGLTest('glx-window-life', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-pixmap-crosscheck'] = PiglitGLTest('glx-pixmap-crosscheck', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXWINDOW-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXWINDOW', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXWINDOW-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXWINDOW', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXPIXMAP-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPIXMAP', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXPIXMAP-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPIXMAP', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXPBUFFER-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=GLXPBUFFER', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXPBUFFER-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=GLXPBUFFER', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_WIDTH'] = PiglitGLTest('glx-query-drawable --attr=GLX_WIDTH --type=WINDOW', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_HEIGHT'] = PiglitGLTest('glx-query-drawable --attr=GLX_HEIGHT --type=WINDOW', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-WINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=WINDOW', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXWINDOW'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXWINDOW', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPIXMAP'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPIXMAP', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_FBCONFIG_ID-GLXPBUFFER'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLX_PRESERVED_CONTENTS'] = PiglitGLTest('glx-query-drawable --attr=GLX_FBCONFIG_ID --type=GLXPBUFFER', require_platforms=['glx', 'mixed_glx_egl'])
+glx['glx-query-drawable-GLXBadDrawable'] = PiglitGLTest('glx-query-drawable --bad-drawable', require_platforms=['glx', 'mixed_glx_egl'])
+glx['extension string sanity'] = PiglitGLTest('glx-string-sanity', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 import_context = {};
 glx['GLX_EXT_import_context'] = import_context
-import_context['free context'] = PiglitGLTest(['glx-free-context'], require_platforms=['glx'])
-import_context['get context ID'] = PiglitGLTest(['glx-get-context-id'], require_platforms=['glx'])
-import_context['get current display'] = PiglitGLTest(['glx-get-current-display-ext'], require_platforms=['glx'])
-import_context['imported context has same context ID'] = PiglitGLTest(['glx-import-context-has-same-context-id'], require_platforms=['glx'])
-import_context['import context, multi process'] = PiglitGLTest(['glx-import-context-multi-process'], require_platforms=['glx'])
-import_context['import context, single process'] = PiglitGLTest(['glx-import-context-single-process'], require_platforms=['glx'])
-import_context['make current, multi process'] = PiglitGLTest(['glx-make-current-multi-process'], require_platforms=['glx'])
-import_context['make current, single process'] = PiglitGLTest(['glx-make-current-single-process'], require_platforms=['glx'])
-import_context['query context info'] = PiglitGLTest(['glx-query-context-info-ext'], require_platforms=['glx'])
+import_context['free context'] = PiglitGLTest(['glx-free-context'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['get context ID'] = PiglitGLTest(['glx-get-context-id'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['get current display'] = PiglitGLTest(['glx-get-current-display-ext'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['imported context has same context ID'] = PiglitGLTest(['glx-import-context-has-same-context-id'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['import context, multi process'] = PiglitGLTest(['glx-import-context-multi-process'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['import context, single process'] = PiglitGLTest(['glx-import-context-single-process'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['make current, multi process'] = PiglitGLTest(['glx-make-current-multi-process'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['make current, single process'] = PiglitGLTest(['glx-make-current-single-process'], require_platforms=['glx', 'mixed_glx_egl'])
+import_context['query context info'] = PiglitGLTest(['glx-query-context-info-ext'], require_platforms=['glx', 'mixed_glx_egl'])
 
 create_context = {};
 glx['GLX_ARB_create_context'] = create_context
-create_context['current with no framebuffer'] = PiglitGLTest('glx-create-context-current-no-framebuffer', run_concurrent=True, require_platforms=['glx'])
-create_context['default major version'] = PiglitGLTest('glx-create-context-default-major-version', run_concurrent=True, require_platforms=['glx'])
-create_context['default minor version'] = PiglitGLTest('glx-create-context-default-minor-version', run_concurrent=True, require_platforms=['glx'])
-create_context['invalid attribute'] = PiglitGLTest('glx-create-context-invalid-attribute', run_concurrent=True, require_platforms=['glx'])
-create_context['invalid flag'] = PiglitGLTest('glx-create-context-invalid-flag', run_concurrent=True, require_platforms=['glx'])
-create_context['forward-compatible flag with pre-3.0'] = PiglitGLTest('glx-create-context-invalid-flag-forward-compatible', run_concurrent=True, require_platforms=['glx'])
-create_context['invalid OpenGL version'] = PiglitGLTest('glx-create-context-invalid-gl-version', run_concurrent=True, require_platforms=['glx'])
-create_context['invalid render type'] = PiglitGLTest('glx-create-context-invalid-render-type', run_concurrent=True, require_platforms=['glx'])
-create_context['color-index render type with 3.0'] = PiglitGLTest('glx-create-context-invalid-render-type-color-index', run_concurrent=True, require_platforms=['glx'])
-create_context['empty attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-empty', run_concurrent=True, require_platforms=['glx'])
-create_context['NULL attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-null', run_concurrent=True, require_platforms=['glx'])
-create_context['forward-compatible flag with 3.0'] = PiglitGLTest('glx-create-context-valid-flag-forward-compatible', run_concurrent=True, require_platforms=['glx'])
+create_context['current with no framebuffer'] = PiglitGLTest('glx-create-context-current-no-framebuffer', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['default major version'] = PiglitGLTest('glx-create-context-default-major-version', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['default minor version'] = PiglitGLTest('glx-create-context-default-minor-version', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['invalid attribute'] = PiglitGLTest('glx-create-context-invalid-attribute', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['invalid flag'] = PiglitGLTest('glx-create-context-invalid-flag', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['forward-compatible flag with pre-3.0'] = PiglitGLTest('glx-create-context-invalid-flag-forward-compatible', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['invalid OpenGL version'] = PiglitGLTest('glx-create-context-invalid-gl-version', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['invalid render type'] = PiglitGLTest('glx-create-context-invalid-render-type', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['color-index render type with 3.0'] = PiglitGLTest('glx-create-context-invalid-render-type-color-index', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['empty attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-empty', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['NULL attribute list'] = PiglitGLTest('glx-create-context-valid-attribute-null', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context['forward-compatible flag with 3.0'] = PiglitGLTest('glx-create-context-valid-flag-forward-compatible', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 create_context_profile = {};
 glx['GLX_ARB_create_context_profile'] = create_context_profile
-create_context_profile['3.2 core profile required'] = PiglitGLTest('glx-create-context-core-profile', run_concurrent=True, require_platforms=['glx'])
-create_context_profile['invalid profile'] = PiglitGLTest('glx-create-context-invalid-profile', run_concurrent=True, require_platforms=['glx'])
-create_context_profile['pre-GL3.2 profile'] = PiglitGLTest('glx-create-context-pre-GL32-profile', run_concurrent=True, require_platforms=['glx'])
+create_context_profile['3.2 core profile required'] = PiglitGLTest('glx-create-context-core-profile', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context_profile['invalid profile'] = PiglitGLTest('glx-create-context-invalid-profile', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context_profile['pre-GL3.2 profile'] = PiglitGLTest('glx-create-context-pre-GL32-profile', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 create_context_robustness = {};
 glx['GLX_ARB_create_context_robustness'] = create_context_robustness
-create_context_robustness['invalid reset notification strategy'] = PiglitGLTest('glx-create-context-invalid-reset-strategy', run_concurrent=True, require_platforms=['glx'])
-create_context_robustness['require GL_ARB_robustness'] = PiglitGLTest('glx-create-context-require-robustness', run_concurrent=True, require_platforms=['glx'])
+create_context_robustness['invalid reset notification strategy'] = PiglitGLTest('glx-create-context-invalid-reset-strategy', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context_robustness['require GL_ARB_robustness'] = PiglitGLTest('glx-create-context-require-robustness', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 create_context_es2_profile = {};
 glx['GLX_EXT_create_context_es2_profile'] = create_context_es2_profile
-create_context_es2_profile['indirect rendering ES2 profile'] = PiglitGLTest('glx-create-context-indirect-es2-profile', run_concurrent=True, require_platforms=['glx'])
-create_context_es2_profile['invalid OpenGL ES version'] = PiglitGLTest('glx-create-context-invalid-es-version', run_concurrent=True, require_platforms=['glx'])
+create_context_es2_profile['indirect rendering ES2 profile'] = PiglitGLTest('glx-create-context-indirect-es2-profile', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+create_context_es2_profile['invalid OpenGL ES version'] = PiglitGLTest('glx-create-context-invalid-es-version', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 oml_sync_control = {};
 glx['GLX_OML_sync_control'] = oml_sync_control
-oml_sync_control['glXGetMscRateOML'] = PiglitGLTest('glx-oml-sync-control-getmscrate', run_concurrent=True, require_platforms=['glx'])
-oml_sync_control['swapbuffersmsc-divisor-zero'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-divisor-zero', run_concurrent=True, require_platforms=['glx'])
-oml_sync_control['swapbuffersmsc-return'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return', run_concurrent=True, require_platforms=['glx'])
-oml_sync_control['swapbuffersmsc-return swap_interval 0'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 0', run_concurrent=True, require_platforms=['glx'])
-oml_sync_control['swapbuffersmsc-return swap_interval 1'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 1', run_concurrent=True, require_platforms=['glx'])
-oml_sync_control['waitformsc'] = PiglitGLTest('glx-oml-sync-control-waitformsc', run_concurrent=True, require_platforms=['glx'])
+oml_sync_control['glXGetMscRateOML'] = PiglitGLTest('glx-oml-sync-control-getmscrate', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+oml_sync_control['swapbuffersmsc-divisor-zero'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-divisor-zero', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+oml_sync_control['swapbuffersmsc-return'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+oml_sync_control['swapbuffersmsc-return swap_interval 0'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 0', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+oml_sync_control['swapbuffersmsc-return swap_interval 1'] = PiglitGLTest('glx-oml-sync-control-swapbuffersmsc-return 1', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
+oml_sync_control['waitformsc'] = PiglitGLTest('glx-oml-sync-control-waitformsc', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 oml_sync_control_nonzeros = [
     mode + [kind, period]
@@ -630,11 +630,11 @@ oml_sync_control_nonzeros = [
     for period in ['1', '2']
 ]
 for arg in oml_sync_control_nonzeros:
-    oml_sync_control[' '.join(['timing'] + arg)] = PiglitGLTest(['glx-oml-sync-control-timing'] + arg, require_platforms=['glx'])
+    oml_sync_control[' '.join(['timing'] + arg)] = PiglitGLTest(['glx-oml-sync-control-timing'] + arg, require_platforms=['glx', 'mixed_glx_egl'])
 
 mesa_query_renderer = {}
 glx['GLX_MESA_query_renderer'] = mesa_query_renderer
-mesa_query_renderer['coverage'] = PiglitGLTest('glx-query-renderer-coverage', run_concurrent=True, require_platforms=['glx'])
+mesa_query_renderer['coverage'] = PiglitGLTest('glx-query-renderer-coverage', run_concurrent=True, require_platforms=['glx', 'mixed_glx_egl'])
 
 def texwrap_test(args):
     return PiglitGLTest('texwrap ' + ' '.join(args), run_concurrent=True)