X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.h;h=41dac24a1a57b8bef3abb4a657ee9e88572c9001;hb=24b24e2203c776aacd9744bb947f5cf47b03d328;hp=0435feec29eb6ccfa874c44530823f53c564e3b7;hpb=efb45a6851563cdb8077b6aad3ab92d4006d8790;p=libs%2Fgl.git

diff --git a/source/core/batch.h b/source/core/batch.h
index 0435feec..41dac24a 100644
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -33,24 +33,21 @@ public:
 
 private:
 	PrimitiveType prim_type;
+	unsigned gl_prim_type;
 	DataType index_type;
-	GLenum gl_index_type;
-	std::vector<UInt8> data;
+	unsigned gl_index_type;
+	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; }
+	unsigned get_gl_primitive_type() const { return gl_prim_type; }
 	void set_index_type(DataType);
 	DataType get_index_type() const { return index_type; }
-
-	DEPRECATED void set_data_type(DataType t) { set_index_type(t); }
-	DEPRECATED DataType get_data_type() const { return index_type; }
+	unsigned get_gl_index_type() const { return gl_index_type; }
 
 	Batch &append(unsigned);
 	Batch &append(const std::vector<unsigned> &);
@@ -66,12 +63,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