Remove remaining deprecated things from the core classes

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

diff --git a/source/core/batch.h b/source/core/batch.h
index 3fedeaf83db8a80e642edf801789abdc55a55b48..6f7e43d61be4e0ca0078e37c2032ab4c006de5b6 100644 (file)
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -33,26 +33,22 @@ public:
 
 private:
        PrimitiveType prim_type;
+       GLenum gl_prim_type;
        DataType index_type;
        GLenum gl_index_type;
-       std::vector<UInt8> data;
+       std::vector<std::uint8_t> data;
        unsigned max_index;
-       bool restart;
-
-       static unsigned restart_index;
 
 public:
        Batch(PrimitiveType t);
        ~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; }
-
        Batch &append(unsigned);
        Batch &append(const std::vector<unsigned> &);
        bool can_append(PrimitiveType);