summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/glwrapper-ogl.cc
diff options
context:
space:
mode:
authorIxtli <cg@325i.org>2010-04-26 22:07:44 +0900
committerEnne Walker <enne.walker@gmail.com>2010-05-14 18:18:52 -0400
commiteae1e195b30980e00252c51583a9d399f0540766 (patch)
tree2aca81e7514a167f7ed37f1219950a4bea85a27c /crawl-ref/source/glwrapper-ogl.cc
parent34da19e84b8f3d0603c6922fde2ce870706d314c (diff)
downloadcrawl-ref-eae1e195b30980e00252c51583a9d399f0540766.tar.gz
crawl-ref-eae1e195b30980e00252c51583a9d399f0540766.zip
Removed GLStateManager::draw and GLPrimitive.
This will force all drawing to be done through VertBuffer. Signed-off-by: Enne Walker <enne.walker@gmail.com>
Diffstat (limited to 'crawl-ref/source/glwrapper-ogl.cc')
-rw-r--r--crawl-ref/source/glwrapper-ogl.cc48
1 files changed, 0 insertions, 48 deletions
diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc
index 74a5e94add..fcbc2e09aa 100644
--- a/crawl-ref/source/glwrapper-ogl.cc
+++ b/crawl-ref/source/glwrapper-ogl.cc
@@ -166,54 +166,6 @@ void OGLStateManager::pixelstore_unpack_alignment(unsigned int bpp)
glPixelStorei(GL_UNPACK_ALIGNMENT, bpp);
}
-void OGLStateManager::draw_primitive(const GLPrimitive &prim)
-{
- // Handle errors
- if (!prim.vert_pointer || prim.count < 1 || prim.size < 1)
- return;
- ASSERT(GLStateManager::_valid(prim.count, prim.mode));
-
- // Set pointers
- glVertexPointer(prim.vert_size, GL_FLOAT, prim.size, prim.vert_pointer);
- if (prim.texture_pointer)
- glTexCoordPointer(2, GL_FLOAT, prim.size, prim.texture_pointer);
- if (prim.colour_pointer)
- glColorPointer(4, GL_UNSIGNED_BYTE, prim.size, prim.colour_pointer);
-
- // Handle pre-render matrix manipulations
- if (prim.pretranslate || prim.prescale)
- {
- glPushMatrix();
- if (prim.pretranslate)
- {
- glTranslatef(prim.pretranslate->x,
- prim.pretranslate->y,
- prim.pretranslate->z);
- }
- if (prim.prescale)
- glScalef(prim.prescale->x, prim.prescale->y, prim.prescale->z);
- }
-
- // Draw!
- switch (prim.mode)
- {
- case GLW_QUADS:
- glDrawArrays(GL_QUADS, 0, prim.count);
- break;
- case GLW_LINES:
- glDrawArrays(GL_LINES, 0, prim.count);
- break;
- default:
- break;
- }
-
- // Clean up
- if (prim.pretranslate || prim.prescale)
- {
- glPopMatrix();
- }
-}
-
void OGLStateManager::delete_textures(size_t count, unsigned int *textures)
{
glDeleteTextures(count, (GLuint*)textures);