Use standard fixed-size integer types

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

diff --git a/source/core/batch.h b/source/core/batch.h
index 0435feec29eb6ccfa874c44530823f53c564e3b7..51cc573b18be326ac7b3ae4c26b75cf146e77aa6 100644 (file)
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -33,21 +33,21 @@ 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; }
@@ -66,12 +66,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