X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=996871c4094ecc659566cd460175392c6b69600a;hb=c233a90fd05f1f5424d7fca94bb6b999f3061271;hp=79d6823135c75fe038f8dd7039a32edae6df7d46;hpb=8e9d872c2ba8dc633d29a673ba93adf38d262a5c;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 79d68231..996871c4 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,8 +1,9 @@
-#include "arb_multitexture.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
 #include "buffer.h"
 #include "error.h"
 #include "gl.h"
+#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -10,17 +11,22 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::ArrayMask VertexArray::enabled_arrays;
-
 VertexArray::VertexArray(const VertexFormat &f):
-	defer_vbuf(true),
 	dirty(false)
 {
 	reset(f);
 }
 
 VertexArray::~VertexArray()
-{ }
+{
+	if(current()==this)
+	{
+		/* We must deactivate arrays here, or apply() would try to access deleted
+		data on the next invocation. */
+		set_current(0);
+		apply_arrays(0, &arrays, 0, 0);
+	}
+}
 
 void VertexArray::reset(const VertexFormat &f)
 {
@@ -28,37 +34,46 @@ void VertexArray::reset(const VertexFormat &f)
 	format = f;
 	stride = get_stride(format);
 
-	bool has_multitex = false;
-	bool has_gen_attrs = false;
+	arrays.clear();
+
+	unsigned offs = 0;
 	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		if(*c>=TEXCOORD1+4 && *c<=TEXCOORD4+12)
-			has_multitex = true;
-		if(*c==TANGENT3 || *c==BINORMAL3 || *c>=ATTRIB1)
-			has_gen_attrs = true;
-	}
-	if(has_multitex)
-		static Require _req(ARB_multitexture);
-	if(has_gen_attrs)
-		static Require _req(ARB_vertex_shader);
-}
+		unsigned slot = get_array_slot(*c);
+		if(slot>=arrays.size())
+			arrays.resize(slot+1);
 
-void VertexArray::use_vertex_buffer()
-{
-	if(vbuf)
-		return;
+		Array &arr = arrays[slot];
+		arr.component = *c;
+		arr.offset = offs;
 
-	vbuf = new Buffer(ARRAY_BUFFER);
-	defer_vbuf = false;
-	dirty = true;
+		offs += get_component_size(*c);
+	}
 }
 
-void VertexArray::use_vertex_buffer(Buffer *b)
+unsigned VertexArray::get_array_slot(unsigned char comp)
 {
-	vbuf = b;
-	vbuf.keep();
-	defer_vbuf = false;
-	dirty = true;
+	unsigned t = get_component_type(comp);
+	if(t==get_component_type(VERTEX3))
+		return 0;
+	else if(t==get_component_type(NORMAL3))
+		return 1;
+	else if(t==get_component_type(COLOR4_FLOAT))
+		return 2;
+	else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
+	{
+		t -= get_component_type(TEXCOORD1);
+		if(t>0)
+			static Require _req(ARB_multitexture);
+		return 3+t;
+	}
+	else
+	{
+		static Require _req(ARB_vertex_shader);
+		if(comp>=ATTRIB1)
+			t -= get_component_type(ATTRIB1);
+		return 7+t;
+	}
 }
 
 void VertexArray::clear()
@@ -74,73 +89,99 @@ void VertexArray::reserve(unsigned n)
 float *VertexArray::append()
 {
 	data.insert(data.end(), stride, 0.0f);
-	set_dirty();
+	dirty = true;
 	return &*(data.end()-stride);
 }
 
 float *VertexArray::modify(unsigned i)
 {
-	set_dirty();
+	dirty = true;
 	return &data[0]+i*stride;
 }
 
-void VertexArray::set_dirty()
+unsigned VertexArray::get_data_size() const
 {
-	dirty = true;
-	if(defer_vbuf)
-	{
-		vbuf = new Buffer(ARRAY_BUFFER);
-		defer_vbuf = false;
-	}
+	return data.size()*sizeof(float);
+}
+
+void VertexArray::upload_data() const
+{
+	get_buffer()->sub_data(get_offset(), get_data_size(), &data[0]);
 }
 
 void VertexArray::apply() const
 {
 	if(format.empty())
 		throw invalid_operation("VertexArray::apply");
+	// Don't mess up the vertex array object of a mesh
+	if(Mesh::current())
+		throw invalid_operation("VertexArray::apply");
 
+	const VertexArray *old = current();
+	/* If the array has been modified, apply it even if it was the last one to
+	be applied.  This is necessary to get the data updated to vertex buffer, and
+	to resync things after a format change.  Radeon drivers also have some
+	problems with modifying vertex arrays without re-setting the pointers. */
+	if(!set_current(this) && !dirty)
+		return;
+
+	Buffer *vbuf = get_buffer();
 	if(vbuf)
 	{
 		vbuf->bind_to(ARRAY_BUFFER);
 		if(dirty)
-		{
-			vbuf->data(data.size()*sizeof(float), &data[0]);
-			dirty = false;
-		}
+			update_buffer();
 	}
 
-	const float *base = (vbuf ? 0 : &data[0]);
-	unsigned offset = 0;
-	ArrayMask found;
-	unsigned bpv = stride*sizeof(float);
+	const float *base = (vbuf ? reinterpret_cast<float *>(get_offset()) : &data[0]);
+	unsigned stride_bytes = stride*sizeof(float);
+	apply_arrays(&arrays, (old ? &old->arrays : 0), base, stride_bytes);
+
+	if(vbuf)
+		Buffer::unbind_from(ARRAY_BUFFER);
+}
+
+void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array> *old_arrays, const float *base, unsigned stride_bytes)
+{
 	unsigned active_tex = 0;
-	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+	unsigned n_arrays = arrays ? arrays->size() : 0;
+	if(old_arrays)
+		n_arrays = max<unsigned>(n_arrays, old_arrays->size());
+	for(unsigned i=0; i<n_arrays; ++i)
 	{
-		unsigned sz = get_component_size(*c);
-		unsigned t = get_component_type(*c);
-		bool en = enabled_arrays.is_set(t);
+		const Array *arr = ((arrays && i<arrays->size() && (*arrays)[i].component) ? &(*arrays)[i] : 0);
+		const Array *old_arr = ((old_arrays && i<old_arrays->size() && (*old_arrays)[i].component) ? &(*old_arrays)[i] : 0);
+		if(!arr && !old_arr)
+			continue;
+
+		unsigned char comp = (arr ? arr->component : old_arr->component);
+		unsigned sz = get_component_size(comp);
+		unsigned t = get_component_type(comp);
+		GLenum array_type = 0;
 		if(t==get_component_type(VERTEX3))
 		{
-			glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_VERTEX_ARRAY);
+			if(arr)
+				glVertexPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset);
+			array_type = GL_VERTEX_ARRAY;
 		}
 		else if(t==get_component_type(NORMAL3))
 		{
-			glNormalPointer(GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_NORMAL_ARRAY);
+			if(arr)
+				glNormalPointer(GL_FLOAT, stride_bytes, base+arr->offset);
+			array_type = GL_NORMAL_ARRAY;
 		}
 		else if(t==get_component_type(COLOR4_FLOAT))
 		{
-			if(sz==1)
-				glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
-			else
-				glColorPointer(sz, GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_COLOR_ARRAY);
+			if(arr)
+			{
+				if(sz==1)
+					glColorPointer(4, GL_UNSIGNED_BYTE, stride_bytes, base+arr->offset);
+				else
+					glColorPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset);
+			}
+			array_type = GL_COLOR_ARRAY;
 		}
-		else if(*c>=TEXCOORD1 && *c<=TEXCOORD4+12)
+		else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
 		{
 			t -= get_component_type(TEXCOORD1);
 			if(t>0 || active_tex)
@@ -148,70 +189,44 @@ void VertexArray::apply() const
 				glClientActiveTexture(GL_TEXTURE0+t);
 				active_tex = t;
 			}
-			glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			if(arr)
+				glTexCoordPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset);
+			array_type = GL_TEXTURE_COORD_ARRAY;
 		}
 		else
 		{
 			if(t>=get_component_type(ATTRIB1))
 				t -= get_component_type(ATTRIB1);
-			glVertexAttribPointer(t, sz, GL_FLOAT, false, bpv, base+offset);
-			if(!en)
-				glEnableVertexAttribArray(t);
+			if(arr)
+				glVertexAttribPointer(t, sz, GL_FLOAT, false, stride_bytes, base+arr->offset);
 		}
-		found.set(t);
-		offset += sz;
-	}
 
-	for(unsigned i=0; i<64; ++i)
-		if(enabled_arrays.is_set(i) && !found.is_set(i))
+		// Only change enable state if needed
+		if(arr && !old_arr)
 		{
-			if(i==get_component_type(VERTEX3))
-				glDisableClientState(GL_VERTEX_ARRAY);
-			else if(i==get_component_type(NORMAL3))
-				glDisableClientState(GL_NORMAL_ARRAY);
-			else if(i==get_component_type(COLOR4_FLOAT))
-				glDisableClientState(GL_COLOR_ARRAY);
-			else if(i>=get_component_type(TEXCOORD1) && i<=get_component_type(TEXCOORD1)+3)
-			{
-				unsigned j = i-get_component_type(TEXCOORD1);
-				if(j>0 || active_tex)
-					glClientActiveTexture(GL_TEXTURE0+j);
-				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-				active_tex = j;
-			}
-			else if(i<get_component_type(ATTRIB1))
-				glDisableVertexAttribArray(i);
+			if(array_type)
+				glEnableClientState(array_type);
 			else
-				glDisableVertexAttribArray(i-get_component_type(ATTRIB1));
+				glEnableVertexAttribArray(t);
 		}
-
-	enabled_arrays = found;
+		else if(old_arr && !arr)
+		{
+			if(array_type)
+				glDisableClientState(array_type);
+			else
+				glDisableVertexAttribArray(t);
+		}
+	}
 
 	if(active_tex)
 		glClientActiveTexture(GL_TEXTURE0);
-
-	if(vbuf)
-		Buffer::unbind_from(ARRAY_BUFFER);
-}
-
-
-VertexArray::ArrayMask::ArrayMask()
-{
-	for(unsigned i=0; i<N; ++i)
-		mask[i] = 0;
 }
 
-void VertexArray::ArrayMask::set(unsigned bit)
-{
-	mask[bit/B] |= 1<<(bit%B);
-}
 
-bool VertexArray::ArrayMask::is_set(unsigned bit) const
-{
-	return mask[bit/B]&(1<<(bit%B));
-}
+VertexArray::Array::Array():
+	component(0),
+	offset(0)
+{ }
 
 
 VertexArray::Loader::Loader(VertexArray &a):