Remove the global drawing functions

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 7716c5b2e4c68f30fcee9ada52213532dec53e29..e5e8120432bb856ce7170eb6168e190b206d67ec 100644 (file)
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -235,27 +235,5 @@ VertexArray::Loader::Loader(VertexArray &a):
        add("attrib4",   static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
 }
 
-
-void array_element(int i)
-{
-       glArrayElement(i);
-}
-
-void draw_arrays(PrimitiveType mode, int first, unsigned count)
-{
-       glDrawArrays(mode, first, count);
-}
-
-void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
-{
-       glDrawElements(mode, count, type, indices);
-}
-
-void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices)
-{
-       static RequireVersion _ver(1, 2);
-       glDrawRangeElements(mode, low, high, count, type, indices);
-}
-
 } // namespace GL
 } // namespace Msp

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7e6d04f5a05aab16c15d6dfb980748f93235cef0..6be5616e95686c97cc003086e80871e2ca4b2a4a 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -73,23 +73,6 @@ private:
        void set_dirty();
 };
 
-void array_element(int);
-void draw_arrays(PrimitiveType, int, unsigned);
-void draw_elements(PrimitiveType, unsigned, DataType, const void *);
-void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *);
-
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
-
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
-
-inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
-
-inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
-
 } // namespace GL
 } // namespace Msp