GLX vendor selection for server-1.20-branch

Now that these changes don't break the ABI, it would be nice to get them into a server 1.20 release.

I've been testing with these changes and an updated driver for a while now.