Memory allocation changes

[libs/gl.git] / source / mesh.cpp

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 67f9698cfa36468d5fb6955f49b5ce5774b95e0f..0e58aa269a1bbdb7679aa36737f0a79ecdb95663 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "buffer.h"
-#include "extension.h"
 #include "mesh.h"
+#include "nv_primitive_restart.h"
 #include "renderer.h"
 
 using namespace std;
@@ -76,7 +69,7 @@ void Mesh::add_batch(const Batch &b)
                PrimitiveType type = b.get_type();
                can_append = (type==batches.back().get_type() &&
                        type!=LINE_STRIP && type!=LINE_LOOP && type!=POLYGON &&
-                       (type!=TRIANGLE_FAN || is_supported("GL_NV_primitive_restart")));
+                       (type!=TRIANGLE_FAN || NV_primitive_restart));
        }
 
        if(defer_ibuf)
@@ -92,7 +85,7 @@ void Mesh::add_batch(const Batch &b)
                Batch *prev = (batches.empty() ? 0 : &batches.back());
                batches.push_back(b);
                if(ibuf)
-                       batches.back().use_index_buffer(ibuf, prev);
+                       batches.back().use_buffer(ibuf, prev);
        }
 }
 
@@ -124,6 +117,8 @@ void Mesh::draw(Renderer &renderer) const
 
        for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
                renderer.draw(*i);
+
+       renderer.set_winding_test(0);
 }