Always require EXT_texture3D and ARB_shadow for samplers

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

diff --git a/source/core/batch.h b/source/core/batch.h
index 51cc573b18be326ac7b3ae4c26b75cf146e77aa6..e03435550aa48857632aff62d4624eb69f871866 100644 (file)
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -22,6 +22,8 @@ class.
 */
 class Batch: public Bufferable
 {
+       friend class Commands;
+
 public:
        class Loader: public DataFile::ObjectLoader<Batch>
        {
@@ -33,9 +35,9 @@ public:
 
 private:
        PrimitiveType prim_type;
-       GLenum gl_prim_type;
+       unsigned gl_prim_type;
        DataType index_type;
-       GLenum gl_index_type;
+       unsigned gl_index_type;
        std::vector<std::uint8_t> data;
        unsigned max_index;
 
@@ -44,13 +46,8 @@ 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; }
 
        Batch &append(unsigned);
        Batch &append(const std::vector<unsigned> &);