X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.cpp;h=b61da0bac79aee1507ac536efa46815c6a5c127a;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=859a6ad5468f0783240d094075063d276764ac0f;hpb=9dc2c20e8c7ac91d932b12492591b65786e24b0f;p=libs%2Fgl.git

diff --git a/source/batch.cpp b/source/batch.cpp
index 859a6ad5..b61da0ba 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,6 +1,6 @@
+#include <msp/gl/extensions/arb_draw_instanced.h>
 #include <msp/gl/extensions/ext_draw_range_elements.h>
-#include <msp/gl/extensions/msp_legacy_features.h>
-#include <msp/gl/extensions/nv_primitive_restart.h>
+#include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
 #include "bindable.h"
 #include "buffer.h"
@@ -59,12 +59,7 @@ Batch::Batch(PrimitiveType t):
 	min_index(0),
 	max_index(0),
 	restart(false)
-{
-	/* Make sure we have glEnable/DisableClientState to go with
-	NV_primitive_restart */
-	if(NV_primitive_restart)
-		(bool)MSP_legacy_features;
-}
+{ }
 
 Batch::~Batch()
 {
@@ -107,10 +102,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)
@@ -118,6 +113,8 @@ void Batch::append(const vector<unsigned> &ind)
 
 	update_offset();
 	dirty = true;
+
+	return *this;
 }
 
 bool Batch::can_append(PrimitiveType other_type)
@@ -125,24 +122,24 @@ 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)
-		return NV_primitive_restart;
+		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)
-		static Require _req(NV_primitive_restart);
+		static Require _req(MSP_primitive_restart);
 
 	if(other.data.empty())
-		return;
+		return *this;
 
-	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)
@@ -159,13 +156,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)
@@ -173,6 +163,8 @@ void Batch::append(const Batch &other)
 
 	update_offset();
 	dirty = true;
+
+	return *this;
 }
 
 void Batch::append_index(unsigned i)
@@ -218,6 +210,27 @@ unsigned Batch::get_index(unsigned i) const
 }
 
 void Batch::draw() const
+{
+	BindRestore _bind_ibuf(get_buffer(), ELEMENT_ARRAY_BUFFER);
+	const void *data_ptr = setup_draw();
+
+	if(EXT_draw_range_elements)
+		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, data_ptr);
+	else
+		glDrawElements(prim_type, size(), data_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(), data_type, data_ptr, count);
+}
+
+const void *Batch::setup_draw() const
 {
 	if(restart)
 	{
@@ -230,36 +243,34 @@ void Batch::draw() const
 			index = 0xFF;
 
 		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();
-	const void *data_ptr;
-	BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-	if(ibuf)
+	if(get_buffer())
 	{
 		if(dirty)
 			update_buffer();
 
-		data_ptr = reinterpret_cast<const void *>(get_offset());
+		return reinterpret_cast<const void *>(get_offset());
 	}
 	else
-		data_ptr = &data[0];
+		return &data[0];
+}
 
-	if(EXT_draw_range_elements)
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, data_ptr);
+void Batch::set_restart_index(unsigned index)
+{
+	if(index>0)
+	{
+		if(!restart_index)
+			glEnable(GL_PRIMITIVE_RESTART);
+		glPrimitiveRestartIndex(index);
+	}
 	else
-		glDrawElements(prim_type, size(), data_type, data_ptr);
+		glDisable(GL_PRIMITIVE_RESTART);
+
+	restart_index = index;
 }