X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=1469ab110ee61d1ec69c37616f43ed310d3315e5;hb=bea2bcf1aa353b1dd8d1728931ef0508677bd2c6;hp=2bc44c9ddfe285c1dac5afa2fb2cd28ef63fba16;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 2bc44c9d..1469ab11 100644
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -1,7 +1,5 @@
-#include <msp/gl/extensions/arb_draw_instanced.h>
 #include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
-#include "bindable.h"
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
@@ -50,14 +48,12 @@ void shrink(vector<Msp::UInt8> &data)
 namespace Msp {
 namespace GL {
 
-unsigned Batch::restart_index = 0;
-
 Batch::Batch(PrimitiveType t):
 	prim_type(t),
+	gl_prim_type(GL::get_gl_primitive_type(prim_type)),
 	index_type(UNSIGNED_SHORT),
 	gl_index_type(get_gl_type(index_type)),
-	max_index(0),
-	restart(false)
+	max_index(0)
 { }
 
 Batch::~Batch()
@@ -66,6 +62,8 @@ Batch::~Batch()
 
 void Batch::set_index_type(DataType t)
 {
+	if(t==index_type)
+		return;
 	if(t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
 		throw invalid_argument("Batch::set_data_type");
 	if(t==UNSIGNED_SHORT && max_index>0xFFFE)
@@ -133,7 +131,6 @@ Batch &Batch::append(const Batch &other)
 		;
 	else if(MSP_primitive_restart)
 	{
-		restart = true;
 		if(index_type==UNSIGNED_INT)
 			::append<UInt32>(data, 0xFFFFFFFF);
 		else
@@ -186,54 +183,6 @@ unsigned Batch::get_index(unsigned i) const
 		return *(UInt16 *)&data[i*sizeof(UInt16)];
 }
 
-void Batch::draw() const
-{
-	const void *data_ptr = setup_draw();
-	glDrawElements(prim_type, size(), gl_index_type, data_ptr);
-}
-
-void Batch::draw_instanced(unsigned count) const
-{
-	static Require req(ARB_draw_instanced);
-
-	const void *data_ptr = setup_draw();
-	glDrawElementsInstanced(prim_type, size(), gl_index_type, data_ptr, count);
-}
-
-const void *Batch::setup_draw() const
-{
-	if(!get_buffer())
-		throw invalid_operation("Batch::setup_draw");
-
-	if(restart)
-	{
-		unsigned index = (index_type==UNSIGNED_INT ? 0xFFFFFFFF : 0xFFFF);
-
-		if(index!=restart_index)
-			set_restart_index(index);
-	}
-	else if(restart_index && restart_index<=max_index)
-		set_restart_index(0);
-
-	refresh();
-
-	return reinterpret_cast<const void *>(get_offset());
-}
-
-void Batch::set_restart_index(unsigned index)
-{
-	if(index>0)
-	{
-		if(!restart_index)
-			glEnable(GL_PRIMITIVE_RESTART);
-		glPrimitiveRestartIndex(index);
-	}
-	else
-		glDisable(GL_PRIMITIVE_RESTART);
-
-	restart_index = index;
-}
-
 
 Batch::Loader::Loader(Batch &b):
 	DataFile::ObjectLoader<Batch>(b)