X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbatch.cpp;h=f14cc307ff71b92deb212e9f759ac70f1c8d69f0;hp=1b0c47bf976dd212aa4270a962d7f98a40f34761;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=98cc25ffe956bc162c053c96df659ba40dfe2d6e

diff --git a/source/batch.cpp b/source/batch.cpp
index 1b0c47bf..f14cc307 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,5 +1,5 @@
-#include <msp/gl/extensions/ext_draw_range_elements.h>
-#include <msp/gl/extensions/nv_primitive_restart.h>
+#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"
@@ -12,7 +12,7 @@ using namespace std;
 namespace {
 
 template<typename T>
-void append(vector<unsigned char> &data, T i)
+void append(vector<Msp::UInt8> &data, T i)
 {
 	data.insert(data.end(), sizeof(T), 0);
 	*(T *)(&data[data.size()-sizeof(T)]) = i;
@@ -28,7 +28,7 @@ U convert(T n)
 }
 
 template<typename T, typename U>
-void expand(vector<unsigned char> &data)
+void expand(vector<Msp::UInt8> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	data.resize(count*sizeof(U));
@@ -37,7 +37,7 @@ void expand(vector<unsigned char> &data)
 }
 
 template<typename T, typename U>
-void shrink(vector<unsigned char> &data)
+void shrink(vector<Msp::UInt8> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	for(unsigned i=0; i<count; ++i)
@@ -54,43 +54,28 @@ unsigned Batch::restart_index = 0;
 
 Batch::Batch(PrimitiveType t):
 	prim_type(t),
-	data_type(UNSIGNED_BYTE),
-	min_index(0),
+	index_type(UNSIGNED_SHORT),
 	max_index(0),
 	restart(false)
-{
-	/* XXX Should probably provide a fallback to glDrawElements since this class
-	is pretty much required to render anything. */
-	static Require _req(EXT_draw_range_elements);
-}
+{ }
 
 Batch::~Batch()
 {
 }
 
-void Batch::set_data_type(DataType t)
+void Batch::set_index_type(DataType t)
 {
-	if(t!=UNSIGNED_BYTE && t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
+	if(t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
 		throw invalid_argument("Batch::set_data_type");
-	if(t==UNSIGNED_BYTE && max_index>0xFE)
-		throw invalid_operation("Batch::set_data_type");
-	else if(t==UNSIGNED_SHORT && max_index>0xFFFE)
+	if(t==UNSIGNED_SHORT && max_index>0xFFFE)
 		throw invalid_operation("Batch::set_data_type");
 
-	if(data_type==UNSIGNED_BYTE && t==UNSIGNED_SHORT)
-		expand<unsigned char, unsigned short>(data);
-	else if(data_type==UNSIGNED_BYTE && t==UNSIGNED_INT)
-		expand<unsigned char, unsigned>(data);
-	else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-		expand<unsigned short, unsigned>(data);
-	else if(data_type==UNSIGNED_INT && t==UNSIGNED_BYTE)
-		shrink<unsigned, unsigned char>(data);
-	else if(data_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-		shrink<unsigned, unsigned short>(data);
-	else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_BYTE)
-		shrink<unsigned short, unsigned char>(data);
-
-	data_type = t;
+	if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
+		expand<UInt16, UInt32>(data);
+	else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
+		shrink<UInt32, UInt16>(data);
+
+	index_type = t;
 	update_offset();
 	dirty = true;
 }
@@ -105,10 +90,10 @@ Batch &Batch::append(unsigned i)
 	return *this;
 }
 
-void Batch::append(const vector<unsigned> &ind)
+Batch &Batch::append(const vector<unsigned> &ind)
 {
 	if(ind.empty())
-		return;
+		return *this;
 
 	data.reserve(data.size()+ind.size()*get_index_size());
 	for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
@@ -116,39 +101,41 @@ void Batch::append(const vector<unsigned> &ind)
 
 	update_offset();
 	dirty = true;
+
+	return *this;
 }
 
 bool Batch::can_append(PrimitiveType other_type)
 {
 	if(other_type!=prim_type)
 		return false;
-	else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
-		return NV_primitive_restart;
+	else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
+		return MSP_primitive_restart;
 	else
 		return true;
 }
 
-void Batch::append(const Batch &other)
+Batch &Batch::append(const Batch &other)
 {
 	if(other.prim_type!=prim_type)
 		throw invalid_argument("Batch::append");
-	if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
-		static Require _req(NV_primitive_restart);
+	if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN)
+		static Require _req(MSP_primitive_restart);
 
 	if(other.data.empty())
-		return;
+		return *this;
+
+	// TODO allow appending triangles to a triangle strip
 
-	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
+	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES)
 		;
-	else if(NV_primitive_restart)
+	else if(MSP_primitive_restart)
 	{
 		restart = true;
-		if(data_type==UNSIGNED_SHORT)
-			::append<unsigned short>(data, 0xFFFF);
-		else if(data_type==UNSIGNED_INT)
-			::append<unsigned>(data, 0xFFFFFFFF);
+		if(index_type==UNSIGNED_INT)
+			::append<UInt32>(data, 0xFFFFFFFF);
 		else
-			data.push_back(0xFF);
+			::append<UInt16>(data, 0xFFFF);
 	}
 	else if(prim_type==TRIANGLE_STRIP)
 	{
@@ -157,13 +144,6 @@ void Batch::append(const Batch &other)
 		if(size()&1)
 			append(other.get_index(0));
 	}
-	else if(prim_type==QUAD_STRIP)
-	{
-		append(get_index(size()-1));
-		append(get_index(size()-1));
-		append(other.get_index(0));
-		append(other.get_index(0));
-	}
 
 	unsigned count = other.size();
 	for(unsigned i=0; i<count; ++i)
@@ -171,87 +151,89 @@ void Batch::append(const Batch &other)
 
 	update_offset();
 	dirty = true;
+
+	return *this;
 }
 
 void Batch::append_index(unsigned i)
 {
 	if(data.empty())
-		min_index = max_index = i;
+		max_index = i;
 	else
-	{
-		min_index = min(min_index, i);
 		max_index = max(max_index, i);
-	}
 
-	if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
-		set_data_type(UNSIGNED_INT);
-	else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
-		set_data_type(UNSIGNED_SHORT);
+	if(index_type==UNSIGNED_SHORT && max_index>0xFFFE)
+		set_index_type(UNSIGNED_INT);
 
-	if(data_type==UNSIGNED_SHORT)
-		::append<unsigned short>(data, i);
-	else if(data_type==UNSIGNED_INT)
-		::append<unsigned>(data, i);
+	if(index_type==UNSIGNED_INT)
+		::append<UInt32>(data, i);
 	else
-		data.push_back(i);
+		::append<UInt16>(data, i);
 }
 
 unsigned Batch::get_index_size() const
 {
-	if(data_type==UNSIGNED_SHORT)
-		return sizeof(unsigned short);
-	else if(data_type==UNSIGNED_INT)
-		return sizeof(unsigned);
-	return sizeof(unsigned char);
+	return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
 }
 
 unsigned Batch::get_index(unsigned i) const
 {
-	if(data_type==UNSIGNED_SHORT)
-		return *(unsigned short *)&data[i*sizeof(unsigned short)];
-	else if(data_type==UNSIGNED_INT)
-		return *(unsigned *)&data[i*sizeof(unsigned )];
+	if(index_type==UNSIGNED_INT)
+		return *(UInt32 *)&data[i*sizeof(UInt32)];
 	else
-		return data[i];
+		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;
-		if(data_type==UNSIGNED_SHORT)
-			index = 0xFFFF;
-		else if(data_type==UNSIGNED_INT)
-			index = 0xFFFFFFFF;
-		else
-			index = 0xFF;
+		unsigned index = (index_type==UNSIGNED_INT ? 0xFFFFFFFF : 0xFFFF);
 
 		if(index!=restart_index)
-		{
-			if(!restart_index)
-				glEnableClientState(GL_PRIMITIVE_RESTART_NV);
-			glPrimitiveRestartIndexNV(index);
-			restart_index = index;
-		}
+			set_restart_index(index);
 	}
 	else if(restart_index && restart_index<=max_index)
-	{
-		glDisableClientState(GL_PRIMITIVE_RESTART_NV);
-		restart_index = 0;
-	}
+		set_restart_index(0);
 
-	Buffer *ibuf = get_buffer();
-	BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-	if(ibuf)
-	{
-		if(dirty)
-			update_buffer();
+	refresh();
 
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
+	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
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);
+		glDisable(GL_PRIMITIVE_RESTART);
+
+	restart_index = index;
 }