X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;fp=source%2Fvertexarray.cpp;h=e3aef7a0eea16cd38302d068535edaa255c56028;hp=9947ac1108a59ef5b5a9a72d9caaa7987ba11782;hb=22f0f95981f17524587f5f2c5e3e91005240ddb7;hpb=a1c39449fccf03ec08787bf51d62bf3b4cb60f69

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 9947ac11..e3aef7a0 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -16,60 +16,11 @@ VertexArray::VertexArray(const VertexFormat &f)
 	reset(f);
 }
 
-VertexArray::~VertexArray()
-{
-	/* Unbind accesses the current VertexArray, so a call from ~Bindable would
-	try to access destroyed data. */
-	if(current()==this)
-		unbind();
-}
-
 void VertexArray::reset(const VertexFormat &f)
 {
 	clear();
 	format = f;
 	stride = get_stride(format);
-
-	arrays.clear();
-
-	unsigned offs = 0;
-	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
-	{
-		unsigned slot = get_array_slot(*c);
-		if(slot>=arrays.size())
-			arrays.resize(slot+1);
-
-		Array &arr = arrays[slot];
-		arr.component = *c;
-		arr.offset = offs;
-
-		offs += get_component_size(*c);
-	}
-}
-
-unsigned VertexArray::get_array_slot(unsigned char comp)
-{
-	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()
@@ -101,81 +52,6 @@ unsigned VertexArray::get_data_size() const
 	return data.size()*sizeof(float);
 }
 
-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");
-
-	static Require _req(ARB_vertex_shader);
-
-	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;
-
-	const Buffer *vbuf = get_buffer();
-	Bind _bind_vbuf(vbuf, ARRAY_BUFFER);
-	if(vbuf && dirty)
-		update_buffer();
-
-	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);
-}
-
-void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array> *old_arrays, const float *base, unsigned stride_bytes)
-{
-	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)
-	{
-		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);
-
-		if(t>=get_component_type(ATTRIB1))
-			t -= get_component_type(ATTRIB1);
-		if(arr)
-		{
-			if(arr->component==COLOR4_UBYTE)
-				glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride_bytes, base+arr->offset);
-			else
-				glVertexAttribPointer(t, sz, GL_FLOAT, false, stride_bytes, base+arr->offset);
-		}
-
-		// Only change enable state if needed
-		if(arr && !old_arr)
-			glEnableVertexAttribArray(t);
-		else if(old_arr && !arr)
-			glDisableVertexAttribArray(t);
-	}
-}
-
-void VertexArray::unbind()
-{
-	const VertexArray *old = current();
-	if(set_current(0))
-		apply_arrays(0, &old->arrays, 0, 0);
-}
-
-
-VertexArray::Array::Array():
-	component(0),
-	offset(0)
-{ }
-
 
 VertexArray::Loader::Loader(VertexArray &a):
 	VertexArrayBuilder(a)