How will Wayland clients use GLAMOR if the upstream is merged into X.org? Or will Wayland clients not need Glamor?
Wayland uses EGL throughout the whole stack, and all the Wayland compositors support it (Kwin, Mutter, etc). Glamor is for 2d acceleration apis like xrender. So if you use x-wayland, that would include glamor from the X repos, but only for X apps running in containments. Any Wayland app would be using EGL / GLES acceleration.