Fix some context-sensitive depracted GL calls in font rendering
Merge