X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=83b7d49b53b69885799a03bfea9e9f33cbb7b4f4;hb=9eb9f592d37e9a1e05c2ff70887a1c5f26b98864;hp=48a49791370dab47de0e0490336aee24766843a7;hpb=acaefb4c669f01855252818ef0a2958cbdababc3;p=libs%2Fgl.git

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 48a49791..83b7d49b 100644
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -1,4 +1,3 @@
-#include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
 #include "error.h"
 
@@ -46,15 +45,12 @@ namespace Msp {
 namespace GL {
 
 Batch::Batch(PrimitiveType t):
+	BatchBackend(t),
 	prim_type(t),
-	gl_prim_type(GL::get_gl_primitive_type(prim_type)),
-	index_type(UNSIGNED_SHORT),
-	gl_index_type(get_gl_type(index_type)),
+	index_type(VOID),
 	max_index(0)
-{ }
-
-Batch::~Batch()
 {
+	set_index_type(UNSIGNED_SHORT);
 }
 
 void Batch::set_index_type(DataType t)
@@ -72,9 +68,19 @@ void Batch::set_index_type(DataType t)
 		shrink<uint32_t, uint16_t>(data);
 
 	index_type = t;
-	gl_index_type = get_gl_type(t);
+	BatchBackend::set_index_type(t);
 	update_offset();
-	dirty = true;
+	mark_dirty();
+}
+
+void Batch::set_patch_size(unsigned s)
+{
+	if(prim_type!=PATCHES)
+		throw invalid_operation("Batch::set_patch_size");
+	if(s<1)
+		throw invalid_argument("Batch::set_patch_size");
+
+	patch_size = s;
 }
 
 Batch &Batch::append(unsigned i)
@@ -82,7 +88,7 @@ Batch &Batch::append(unsigned i)
 	append_index(i);
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -97,7 +103,7 @@ Batch &Batch::append(const vector<unsigned> &ind)
 		append_index(i);
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -106,8 +112,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)
-		return MSP_primitive_restart;
+	else if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
+		return check_restart(false);
 	else
 		return true;
 }
@@ -116,8 +122,8 @@ 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(MSP_primitive_restart);
+	if(prim_type==LINE_STRIP || prim_type==TRIANGLE_FAN)
+		check_restart(true);
 
 	if(other.data.empty())
 		return *this;
@@ -126,7 +132,7 @@ Batch &Batch::append(const Batch &other)
 
 	if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES)
 		;
-	else if(MSP_primitive_restart)
+	else if(check_restart(false))
 	{
 		if(index_type==UNSIGNED_INT)
 			::append<uint32_t>(data, 0xFFFFFFFF);
@@ -146,7 +152,7 @@ Batch &Batch::append(const Batch &other)
 		append_index(other.get_index(i));
 
 	update_offset();
-	dirty = true;
+	mark_dirty();
 
 	return *this;
 }
@@ -167,12 +173,7 @@ void Batch::append_index(unsigned i)
 		::append<uint16_t>(data, i);
 }
 
-unsigned Batch::get_index_size() const
-{
-	return (index_type==UNSIGNED_INT ? sizeof(uint32_t) : sizeof(uint16_t));
-}
-
-unsigned Batch::get_index(unsigned i) const
+unsigned Batch::get_index(size_t i) const
 {
 	if(index_type==UNSIGNED_INT)
 		return *(uint32_t *)&data[i*sizeof(uint32_t)];
@@ -185,6 +186,7 @@ Batch::Loader::Loader(Batch &b):
 	DataFile::ObjectLoader<Batch>(b)
 {
 	add("indices", &Loader::indices);
+	add("patch_size", &Loader::patch_size);
 }
 
 void Batch::Loader::indices(const vector<unsigned> &ind)
@@ -192,5 +194,10 @@ void Batch::Loader::indices(const vector<unsigned> &ind)
 	obj.append(ind);
 }
 
+void Batch::Loader::patch_size(unsigned s)
+{
+	obj.set_patch_size(s);
+}
+
 } // namespace GL
 } // namespace Msp