Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code."