Replaced all the Mesa specific code by GLX code. Should work now on