glut_osx branch fixes to shaders