Remove the global drawing functions

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

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index f3476268b8c5c30071ba70a7c14c9e349d6a9359..e5e8120432bb856ce7170eb6168e190b206d67ec 100644 (file)
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,5 +1,6 @@
 #include "arb_vertex_program.h"
 #include "buffer.h"
+#include "error.h"
 #include "extension.h"
 #include "gl.h"
 #include "version_1_2.h"
@@ -75,7 +76,7 @@ void VertexArray::reset(const VertexFormat &f)
 void VertexArray::apply() const
 {
        if(format.empty())
-               throw InvalidState("Trying to apply a vertex array with no data");
+               throw invalid_operation("VertexArray::apply");
 
        if(vbuf)
        {
@@ -234,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