summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/glwrapper-ogl.cc
diff options
context:
space:
mode:
authorEnne Walker <enne.walker@gmail.com>2010-05-14 12:16:19 -0400
committerEnne Walker <enne.walker@gmail.com>2010-05-14 18:18:54 -0400
commit6375f13e84238370564a57711c19cffaf3b3009d (patch)
treeca2f6503f925b04d5946b9c38ba2d2f90446b8ad /crawl-ref/source/glwrapper-ogl.cc
parenta7c8d89bd1ae36e219795d8cefb8333bc068bbfc (diff)
downloadcrawl-ref-6375f13e84238370564a57711c19cffaf3b3009d.tar.gz
crawl-ref-6375f13e84238370564a57711c19cffaf3b3009d.zip
Expose GL state to draw call API.
This avoids weird global state setting and then querying in the next function.
Diffstat (limited to 'crawl-ref/source/glwrapper-ogl.cc')
-rw-r--r--crawl-ref/source/glwrapper-ogl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc
index 1451d8567c..9002e568cd 100644
--- a/crawl-ref/source/glwrapper-ogl.cc
+++ b/crawl-ref/source/glwrapper-ogl.cc
@@ -356,16 +356,16 @@ void OGLShapeBuffer::add_line(const GLWRect &rect)
}
// Draw the buffer
-void OGLShapeBuffer::draw(GLW_3VF *pt, GLW_3VF *ps)
+void OGLShapeBuffer::draw(const GLState &state, GLW_3VF *pt, GLW_3VF *ps)
{
if (m_position_buffer.size() == 0)
return;
- const GLState &state = glmanager->get_state();
-
if (!state.array_vertex)
return;
+ glmanager->set(state);
+
glVertexPointer(3, GL_FLOAT, 0, &m_position_buffer[0]);
if (state.array_texcoord && m_texture_verts)