Disconnect the PrimitiveType enum from OpenGL constants

[libs/gl.git] / source / core / batch.h

diff --git a/source/core/batch.h b/source/core/batch.h
index 0435feec29eb6ccfa874c44530823f53c564e3b7..c2107f823c2907a28cf36e79b2c6190cdc486a1b 100644 (file)
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -33,6 +33,7 @@ public:
 
 private:
        PrimitiveType prim_type;
+       GLenum gl_prim_type;
        DataType index_type;
        GLenum gl_index_type;
        std::vector<UInt8> data;
@@ -46,8 +47,10 @@ public:
        ~Batch();
 
        PrimitiveType get_type() const { return prim_type; }
+       GLenum get_gl_primitive_type() const { return gl_prim_type; }
        void set_index_type(DataType);
        DataType get_index_type() const { return index_type; }
+       GLenum get_gl_index_type() const { return gl_index_type; }
 
        DEPRECATED void set_data_type(DataType t) { set_index_type(t); }
        DEPRECATED DataType get_data_type() const { return index_type; }
@@ -66,12 +69,6 @@ public:
        unsigned size() const { return data.size()/get_index_size(); }
 
        unsigned get_index(unsigned) const;
-
-       void draw() const;
-       void draw_instanced(unsigned) const;
-private:
-       const void *setup_draw() const;
-       static void set_restart_index(unsigned);
 };
 
 } // namespace GL