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

diff --git a/source/batch.cpp b/source/batch.cpp
index d6924a80..bca33484 100644
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,9 +1,10 @@
+#include <msp/gl/extensions/ext_draw_range_elements.h>
+#include <msp/gl/extensions/nv_primitive_restart.h>
 #include "batch.h"
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
-#include "ext_draw_range_elements.h"
-#include "nv_primitive_restart.h"
+#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -97,7 +98,7 @@ void Batch::set_data_type(DataType t)
 Batch &Batch::append(unsigned i)
 {
 	append_index(i);
-	
+
 	update_offset();
 	dirty = true;
 
@@ -117,6 +118,16 @@ void Batch::append(const vector<unsigned> &ind)
 	dirty = true;
 }
 
+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
+		return true;
+}
+
 void Batch::append(const Batch &other)
 {
 	if(other.prim_type!=prim_type)
@@ -229,21 +240,33 @@ void Batch::draw() const
 			restart_index = index;
 		}
 	}
-	else if(restart_index && restart_index<max_index)
+	else if(restart_index && restart_index<=max_index)
 	{
 		glDisableClientState(GL_PRIMITIVE_RESTART_NV);
 		restart_index = 0;
 	}
 
-	if(get_buffer())
+	if(Buffer *ibuf = get_buffer())
 	{
+		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();
 
-		BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
-		Bind bind_ibuf(alias, true);
-
 		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
+		if(!have_vao)
+		{
+			if(old_ibuf)
+				old_ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+			else
+				Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+		}
 	}
 	else
 		glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);