merge from LosingLin/MacOpenGL master

merge