Remove the global drawing functions

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

diff --git a/source/batch.cpp b/source/batch.cpp
index b4b88176559a744ffa602fed13951ebd8a65b669..375c52e9ca25da98131f76924eb457b80bf9f255 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -5,6 +5,7 @@
 #include "extension.h"
 #include "nv_primitive_restart.h"
 #include "vertexarray.h"
+#include "version_1_2.h"
 
 using namespace std;
 
@@ -24,7 +25,11 @@ Batch::Batch(PrimitiveType t):
        next_in_ibuf(0),
        prev_in_ibuf(0),
        dirty(false)
-{ }
+{
+       /* XXX Should probably provide a fallback to glDrawElements since this class
+       is pretty much required to render anything. */
+       static RequireVersion _ver(1, 2);
+}
 
 Batch::~Batch()
 {
@@ -244,7 +249,7 @@ void Batch::draw() const
                BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*ibuf);
                Bind bind_ibuf(alias, true);
 
-               glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, (void *)ibuf_offset);
+               glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(ibuf_offset));
        }
        else
                glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);