Changed opengl-cuda mapping functions to non-deprecated ones.
Merge remote-tracking branch 'origin/master'