X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbatch.cpp;h=3d7dfc720ad901d40832e77510d3159339910e29;hp=bca33484ce976cc585d8da88187c8ba568baed23;hb=6a045019fbd68738b77849629e6dfd3dfd9a4d93;hpb=c233a90fd05f1f5424d7fca94bb6b999f3061271

diff --git a/source/batch.cpp b/source/batch.cpp
index bca33484..3d7dfc72 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,4 +1,6 @@
 #include <msp/gl/extensions/ext_draw_range_elements.h>
+#include <msp/gl/extensions/msp_legacy_features.h>
+#include <msp/gl/extensions/msp_primitive_restart.h>
 #include <msp/gl/extensions/nv_primitive_restart.h>
 #include "batch.h"
 #include "bindable.h"
@@ -59,9 +61,10 @@ Batch::Batch(PrimitiveType t):
 	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);
+	/* Make sure we have glEnable/DisableClientState to go with
+	NV_primitive_restart */
+	if(!MSP_primitive_restart && NV_primitive_restart)
+		(bool)MSP_legacy_features;
 }
 
 Batch::~Batch()
@@ -122,8 +125,8 @@ 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 || NV_primitive_restart;
 	else
 		return true;
 }
@@ -132,15 +135,18 @@ void 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)
+	{
+		if(!MSP_primitive_restart)
+			static Require _req(NV_primitive_restart);
+	}
 
 	if(other.data.empty())
 		return;
 
 	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
 		;
-	else if(NV_primitive_restart)
+	else if(MSP_primitive_restart || NV_primitive_restart)
 	{
 		restart = true;
 		if(data_type==UNSIGNED_SHORT)
@@ -196,11 +202,6 @@ void Batch::append_index(unsigned i)
 		data.push_back(i);
 }
 
-void Batch::upload_data() const
-{
-	get_buffer()->sub_data(get_offset(), data.size(), &data[0]);
-}
-
 unsigned Batch::get_index_size() const
 {
 	if(data_type==UNSIGNED_SHORT)
@@ -233,43 +234,56 @@ 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);
 
-	if(Buffer *ibuf = get_buffer())
+	Buffer *ibuf = get_buffer();
+	const void *data_ptr;
+	BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
+	if(ibuf)
 	{
-		bool have_vao = Mesh::current();
-		const Buffer *old_ibuf = 0;
-		if(!have_vao)
-		{
-			old_ibuf = Buffer::current(ELEMENT_ARRAY_BUFFER);
-			ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-		}
-
 		if(dirty)
 			update_buffer();
 
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
-		if(!have_vao)
+		data_ptr = reinterpret_cast<const void *>(get_offset());
+	}
+	else
+		data_ptr = &data[0];
+
+	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::set_restart_index(unsigned index)
+{
+	if(MSP_primitive_restart)
+	{
+		if(index>0)
 		{
-			if(old_ibuf)
-				old_ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-			else
-				Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+			if(!restart_index)
+				glEnable(GL_PRIMITIVE_RESTART);
+			glPrimitiveRestartIndex(index);
 		}
+		else
+			glDisable(GL_PRIMITIVE_RESTART);
 	}
 	else
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);
+	{
+		if(index>0)
+		{
+			if(!restart_index)
+				glEnableClientState(GL_PRIMITIVE_RESTART_NV);
+			glPrimitiveRestartIndexNV(index);
+		}
+		else
+			glDisableClientState(GL_PRIMITIVE_RESTART_NV);
+	}
+
+	restart_index = index;
 }