Clean up GL code function parameters.

Remove any non-const-reference parameters.  Change const pointer
parameters to const reference parameters.  Change all draw(NULL, NULL)
calls to just draw().  Also, refactor to remove pretranslate and prescale
parameters from draw calls.

1 files changed, 8 insertions, 21 deletions

diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc
index c7322b3c07..6b8a4a9cec 100644
--- a/crawl-ref/source/glwrapper-ogl.cc
+++ b/crawl-ref/source/glwrapper-ogl.cc
@@ -132,16 +132,14 @@ void OGLStateManager::set(const GLState& state)
     m_current_state = state;
 }
 
-void OGLStateManager::set_transform(const GLW_3VF *trans, const GLW_3VF *scale)
+void OGLStateManager::set_transform(const GLW_3VF &trans, const GLW_3VF &scale)
 {
     glLoadIdentity();
-    if (trans)
-        glTranslatef(trans->x, trans->y, trans->z);
-    if (scale)
-        glScalef(scale->x, scale->y, scale->z);
+    glTranslatef(trans.x, trans.y, trans.z);
+    glScalef(scale.x, scale.y, scale.z);
 }
 
-void OGLStateManager::reset_view_for_resize(coord_def &m_windowsz)
+void OGLStateManager::reset_view_for_resize(const coord_def &m_windowsz)
 {
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
@@ -344,7 +342,10 @@ void OGLShapeBuffer::add_line(const GLWPrim &rect)
 }
 
 // Draw the buffer
-void OGLShapeBuffer::draw(const GLState &state, GLW_3VF *pt, GLW_3VF *ps)
+#if 0
+void OGLShapeBuffer::draw(const GLState &state, const GLW_3VF *pt, const GLW_3VF *ps)
+#endif
+void OGLShapeBuffer::draw(const GLState &state)
 {
     if (m_position_buffer.size() == 0)
         return;
@@ -362,16 +363,6 @@ void OGLShapeBuffer::draw(const GLState &state, GLW_3VF *pt, GLW_3VF *ps)
     if (state.array_colour && m_colour_verts)
         glColorPointer(4, GL_UNSIGNED_BYTE, 0, &m_colour_buffer[0]);
 
-    // Handle pre-render matrix manipulations
-    if (pt || ps)
-    {
-        glPushMatrix();
-        if (pt)
-            glTranslatef(pt->x, pt->y, pt->z);
-        if (ps)
-            glScalef(ps->x, ps->y, ps->z);
-    }
-
     switch (m_prim_type)
     {
     case GLW_RECTANGLE:
@@ -385,10 +376,6 @@ void OGLShapeBuffer::draw(const GLState &state, GLW_3VF *pt, GLW_3VF *ps)
         ASSERT(!"Invalid primitive type");
         break;
     }
-
-    // Clean up
-    if (pt || ps)
-        glPopMatrix();
 }
 
 void OGLShapeBuffer::clear()