X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbatch.cpp;h=3d7dfc720ad901d40832e77510d3159339910e29;hb=0ab875bdc9fbf84ecfce883b188410bb45882447;hp=e097fd6365d52b65db4a8d37110ef0f3010a7ccf;hpb=f1b12c992db974c679d85ae6ec22cd318199d0d5;p=libs%2Fgl.git

diff --git a/source/batch.cpp b/source/batch.cpp
index e097fd63..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()
@@ -123,7 +126,7 @@ 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 || NV_primitive_restart;
 	else
 		return true;
 }
@@ -133,14 +136,17 @@ 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)
-		static Require _req(NV_primitive_restart);
+	{
+		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)
@@ -228,30 +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);
 
 	Buffer *ibuf = get_buffer();
+	const void *data_ptr;
 	BindRestore _bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
 	if(ibuf)
 	{
 		if(dirty)
 			update_buffer();
 
-		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
+		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(!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;
 }