With the switch to eglut, xegl_tri supports both X11 and EGL_MESA_screen_surface. Have it replace egltri.
Move the demos to "opengl" subdirectory.