In that case, would it make sense to start over with glxdisplay and build in the egl specific stuff from egldisplay?