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

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 48a49791..9639a320 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,12 +45,13 @@ 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)
-{ }
+{
+	set_index_type(UNSIGNED_SHORT);
+}
 
 Batch::~Batch()
 {
@@ -72,7 +72,7 @@ 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;
 }
@@ -106,8 +106,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 +116,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 +126,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);
@@ -167,12 +167,12 @@ void Batch::append_index(unsigned 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_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)];