X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=86c9f0f237f5cbc9c178da7ebcf082a99454fc9c;hb=73567be7cd9e01e620cb2a8fa0ca381723b9a71f;hp=1094bb21c9ef229359a09f70b35435c32f6e8444;hpb=2d3113a7dbbe4be2f1d1e8980c1c4e42175163da;p=libs%2Fgl.git

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 1094bb21..86c9f0f2 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -23,7 +23,8 @@ VertexSetup::VertexSetup():
 	dirty(0),
 	vertex_array(0),
 	inst_array(0),
-	index_buffer(0)
+	index_buffer(0),
+	index_type(UNSIGNED_SHORT)
 {
 	static Require req(ARB_vertex_array_object);
 	if(ARB_direct_state_access)
@@ -34,8 +35,6 @@ VertexSetup::VertexSetup():
 
 VertexSetup::~VertexSetup()
 {
-	if(current()==this)
-		unbind();
 	glDeleteVertexArrays(1, &id);
 }
 
@@ -70,7 +69,7 @@ void VertexSetup::set_vertex_array(const VertexArray &a)
 		throw invalid_argument("VertexSetup::set_vertex_array");
 
 	vertex_array = &a;
-	update(VERTEX_ARRAY);
+	dirty |= VERTEX_ARRAY;
 }
 
 void VertexSetup::set_instance_array(const VertexArray &a)
@@ -85,13 +84,14 @@ void VertexSetup::set_instance_array(const VertexArray &a)
 	static Require req(ARB_instanced_arrays);
 
 	inst_array = &a;
-	update(INSTANCE_ARRAY);
+	dirty |= INSTANCE_ARRAY;
 }
 
-void VertexSetup::set_index_buffer(const Buffer &ibuf)
+void VertexSetup::set_index_buffer(const Buffer &ibuf, DataType itype)
 {
 	index_buffer = &ibuf;
-	update(INDEX_BUFFER);
+	index_type = itype;
+	dirty |= INDEX_BUFFER;
 }
 
 bool VertexSetup::verify_format(const VertexFormat &fmt)
@@ -108,33 +108,31 @@ bool VertexSetup::verify_format(const VertexFormat &fmt)
 	return true;
 }
 
-void VertexSetup::update(unsigned mask) const
+void VertexSetup::update() const
 {
 	static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
-	if(!direct && current()!=this)
-	{
-		dirty |= mask;
-		return;
-	}
 
-	if(mask&VERTEX_ARRAY)
+	if(dirty&VERTEX_ARRAY)
 		update_vertex_array(*vertex_array, 0, 0, direct);
 
-	if((mask&INSTANCE_ARRAY) && inst_array)
+	if(dirty&INSTANCE_ARRAY)
 		update_vertex_array(*inst_array, 1, 1, direct);
 
-	if(mask&INDEX_BUFFER)
+	if(dirty&INDEX_BUFFER)
 	{
 		if(direct)
 			glVertexArrayElementBuffer(id, index_buffer->get_id());
 		else
-			glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
 	}
+
+	dirty = 0;
 }
 
 void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const
 {
-	Conditional<Bind> bind_vbuf(!direct, array.get_buffer(), ARRAY_BUFFER);
+	if(!direct)
+		glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id());
 
 	const VertexFormat &fmt = array.get_format();
 	unsigned stride = fmt.stride()*sizeof(float);
@@ -170,31 +168,9 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
 		}
 		offset += sz*sizeof(float);
 	}
-}
 
-void VertexSetup::bind() const
-{
-	if(!vertex_array || !index_buffer)
-		throw invalid_operation("VertexSetup::bind");
-
-	if(set_current(this))
-	{
-		vertex_array->refresh();
-		if(inst_array)
-			inst_array->refresh();
-		glBindVertexArray(id);
-		if(dirty)
-		{
-			update(dirty);
-			dirty = 0;
-		}
-	}
-}
-
-void VertexSetup::unbind()
-{
-	if(set_current(0))
-		glBindVertexArray(0);
+	if(!direct)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
 void VertexSetup::unload()
@@ -207,8 +183,8 @@ void VertexSetup::unload()
 	}
 	else
 	{
-		BindRestore _bind(*this);
-		Buffer::unbind_from(ARRAY_BUFFER);
+		glBindVertexArray(id);
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
 
 		for(const unsigned char *a=vertex_format.begin(); a!=vertex_format.end(); ++a)
 		{
@@ -223,7 +199,7 @@ void VertexSetup::unload()
 			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
 		}
 
-		glBindBuffer(ELEMENT_ARRAY_BUFFER, 0);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 	}
 
 	vertex_array = 0;