X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=b882cf1be18f6f5e0b2ede67e831a8eed0ae1cee;hp=f14cc307ff71b92deb212e9f759ac70f1c8d69f0;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index f14cc307..b882cf1b 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"
@@ -12,7 +10,7 @@ using namespace std;
 namespace {
 
 template<typename T>
-void append(vector<Msp::UInt8> &data, T i)
+void append(vector<uint8_t> &data, T i)
 {
 	data.insert(data.end(), sizeof(T), 0);
 	*(T *)(&data[data.size()-sizeof(T)]) = i;
@@ -28,7 +26,7 @@ U convert(T n)
 }
 
 template<typename T, typename U>
-void expand(vector<Msp::UInt8> &data)
+void expand(vector<uint8_t> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	data.resize(count*sizeof(U));
@@ -37,7 +35,7 @@ void expand(vector<Msp::UInt8> &data)
 }
 
 template<typename T, typename U>
-void shrink(vector<Msp::UInt8> &data)
+void shrink(vector<uint8_t> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	for(unsigned i=0; i<count; ++i)
@@ -50,13 +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),
-	max_index(0),
-	restart(false)
+	gl_index_type(get_gl_type(index_type)),
+	max_index(0)
 { }
 
 Batch::~Batch()
@@ -65,17 +62,20 @@ 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)
 		throw invalid_operation("Batch::set_data_type");
 
 	if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-		expand<UInt16, UInt32>(data);
+		expand<uint16_t, uint32_t>(data);
 	else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-		shrink<UInt32, UInt16>(data);
+		shrink<uint32_t, uint16_t>(data);
 
 	index_type = t;
+	gl_index_type = get_gl_type(t);
 	update_offset();
 	dirty = true;
 }
@@ -96,8 +96,8 @@ Batch &Batch::append(const vector<unsigned> &ind)
 		return *this;
 
 	data.reserve(data.size()+ind.size()*get_index_size());
-	for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
-		append_index(*i);
+	for(unsigned i: ind)
+		append_index(i);
 
 	update_offset();
 	dirty = true;
@@ -131,11 +131,10 @@ Batch &Batch::append(const Batch &other)
 		;
 	else if(MSP_primitive_restart)
 	{
-		restart = true;
 		if(index_type==UNSIGNED_INT)
-			::append<UInt32>(data, 0xFFFFFFFF);
+			::append<uint32_t>(data, 0xFFFFFFFF);
 		else
-			::append<UInt16>(data, 0xFFFF);
+			::append<uint16_t>(data, 0xFFFF);
 	}
 	else if(prim_type==TRIANGLE_STRIP)
 	{
@@ -166,74 +165,22 @@ void Batch::append_index(unsigned i)
 		set_index_type(UNSIGNED_INT);
 
 	if(index_type==UNSIGNED_INT)
-		::append<UInt32>(data, i);
+		::append<uint32_t>(data, i);
 	else
-		::append<UInt16>(data, i);
+		::append<uint16_t>(data, i);
 }
 
 unsigned Batch::get_index_size() const
 {
-	return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
+	return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
 }
 
 unsigned Batch::get_index(unsigned i) const
 {
 	if(index_type==UNSIGNED_INT)
-		return *(UInt32 *)&data[i*sizeof(UInt32)];
-	else
-		return *(UInt16 *)&data[i*sizeof(UInt16)];
-}
-
-void Batch::draw() const
-{
-	BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
-	const void *data_ptr = setup_draw();
-
-	glDrawElements(prim_type, size(), index_type, data_ptr);
-}
-
-void Batch::draw_instanced(unsigned count) const
-{
-	static Require req(ARB_draw_instanced);
-
-	BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
-	const void *data_ptr = setup_draw();
-
-	glDrawElementsInstanced(prim_type, size(), 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);
-	}
+		return *(uint32_t *)&data[i*sizeof(uint32_t)];
 	else
-		glDisable(GL_PRIMITIVE_RESTART);
-
-	restart_index = index;
+		return *(uint16_t *)&data[i*sizeof(uint16_t)];
 }