Update to gfx/gl2.v2