merge back to opengl3 gem