X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbatch.cpp;h=382cfbdb5df1ab6526df9e6c6c96e0004d620612;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hp=2be5cc3a69ffacd2472f2575da0b480db37b3989;hpb=a60b558e1c327fd2e2600ad2551dc0ac648761f2;p=libs%2Fgl.git

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 2be5cc3a..382cfbdb 100644
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -1,16 +1,12 @@
-#include <msp/gl/extensions/msp_primitive_restart.h>
 #include "batch.h"
-#include "buffer.h"
 #include "error.h"
-#include "mesh.h"
-#include "vertexarray.h"
 
 using namespace std;
 
 namespace {
 
 template<typename T>
-void append(vector<Msp::UInt8> &data, T i)
+void append(vector<uint8_t> &data, T i)
 {
 	data.insert(data.end(), sizeof(T), 0);
 	*(T *)(&data[data.size()-sizeof(T)]) = i;
@@ -26,7 +22,7 @@ U convert(T n)
 }
 
 template<typename T, typename U>
-void expand(vector<Msp::UInt8> &data)
+void expand(vector<uint8_t> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	data.resize(count*sizeof(U));
@@ -35,7 +31,7 @@ void expand(vector<Msp::UInt8> &data)
 }
 
 template<typename T, typename U>
-void shrink(vector<Msp::UInt8> &data)
+void shrink(vector<uint8_t> &data)
 {
 	unsigned count = data.size()/sizeof(T);
 	for(unsigned i=0; i<count; ++i)
@@ -48,19 +44,13 @@ void shrink(vector<Msp::UInt8> &data)
 namespace Msp {
 namespace GL {
 
-unsigned Batch::restart_index = 0;
-
 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)),
-	max_index(0),
-	restart(false)
-{ }
-
-Batch::~Batch()
+	index_type(VOID),
+	max_index(0)
 {
+	set_index_type(UNSIGNED_SHORT);
 }
 
 void Batch::set_index_type(DataType t)
@@ -73,12 +63,12 @@ void Batch::set_index_type(DataType t)
 		throw invalid_operation("Batch::set_data_type");
 
 	if(index_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-		expand<UInt16, UInt32>(data);
+		expand<uint16_t, uint32_t>(data);
 	else if(index_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-		shrink<UInt32, UInt16>(data);
+		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;
 }
@@ -99,8 +89,8 @@ Batch &Batch::append(const vector<unsigned> &ind)
 		return *this;
 
 	data.reserve(data.size()+ind.size()*get_index_size());
-	for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
-		append_index(*i);
+	for(unsigned i: ind)
+		append_index(i);
 
 	update_offset();
 	dirty = true;
@@ -112,8 +102,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;
 }
@@ -122,8 +112,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;
@@ -132,13 +122,12 @@ 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))
 	{
-		restart = true;
 		if(index_type==UNSIGNED_INT)
-			::append<UInt32>(data, 0xFFFFFFFF);
+			::append<uint32_t>(data, 0xFFFFFFFF);
 		else
-			::append<UInt16>(data, 0xFFFF);
+			::append<uint16_t>(data, 0xFFFF);
 	}
 	else if(prim_type==TRIANGLE_STRIP)
 	{
@@ -169,22 +158,22 @@ void Batch::append_index(unsigned i)
 		set_index_type(UNSIGNED_INT);
 
 	if(index_type==UNSIGNED_INT)
-		::append<UInt32>(data, i);
+		::append<uint32_t>(data, i);
 	else
-		::append<UInt16>(data, i);
+		::append<uint16_t>(data, i);
 }
 
-unsigned Batch::get_index_size() const
+size_t Batch::get_index_size() const
 {
-	return (index_type==UNSIGNED_INT ? sizeof(UInt32) : sizeof(UInt16));
+	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 *)&data[i*sizeof(UInt32)];
+		return *(uint32_t *)&data[i*sizeof(uint32_t)];
 	else
-		return *(UInt16 *)&data[i*sizeof(UInt16)];
+		return *(uint16_t *)&data[i*sizeof(uint16_t)];
 }