glViewport moved back out, given size accessor function
Merge branch 'graphics'