X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=c6724e13a27f05d1c509ac189d379fe3f392c2e6;hb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;hp=6740818e794228e78ebedbbc880855aa3abcb33c;hpb=d653d25b548070c688e40c052730d63345ce70c9;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 6740818e..c6724e13 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -35,13 +35,13 @@ void VertexArray::use_vertex_buffer()
 	if(vbuf && own_vbuf)
 		return;
 
-	vbuf=new VertexBuffer();
+	vbuf=new Buffer(ARRAY_BUFFER);
 	own_vbuf=true;
 
 	update_data();
 }
 
-void VertexArray::use_vertex_buffer(VertexBuffer *b)
+void VertexArray::use_vertex_buffer(Buffer *b)
 {
 	if(own_vbuf)
 		delete vbuf;
@@ -83,13 +83,13 @@ void VertexArray::apply() const
 		vbuf->bind();
 
 	const float *base=vbuf?0:&data[0];
-	uint offset=0;
-	uint found=0;
-	uint bpv=stride*sizeof(float);
+	unsigned offset=0;
+	unsigned found=0;
+	unsigned bpv=stride*sizeof(float);
 	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		uint sz=(*c&3)+1;
-		uint t=*c>>2;
+		unsigned sz=(*c&3)+1;
+		unsigned t=*c>>2;
 		switch(t)
 		{
 		case 0:
@@ -123,7 +123,7 @@ void VertexArray::apply() const
 		set_array(i-4, (found>>i)&1, 1<<i);
 
 	if(vbuf)
-		VertexBuffer::unbind();
+		vbuf->unbind();
 }
 
 /**
@@ -134,7 +134,7 @@ void VertexArray::update_data()
 	if(vbuf)
 	{
 		vbuf->data(data.size()*sizeof(float), &data[0]);
-		VertexBuffer::unbind();
+		vbuf->unbind();
 	}
 }
 
@@ -192,17 +192,17 @@ void array_element(int i)
 	glArrayElement(i);
 }
 
-void draw_arrays(PrimitiveType mode, int first, sizei count)
+void draw_arrays(PrimitiveType mode, int first, unsigned count)
 {
 	glDrawArrays(mode, first, count);
 }
 
-void draw_elements(PrimitiveType mode, sizei count, DataType type, const void *indices)
+void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
 {
 	glDrawElements(mode, count, type, indices);
 }
 
-void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, DataType type, const void *indices)
+void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices)
 {
 	static RequireVersion _ver(1, 2);
 	glDrawRangeElements(mode, low, high, count, type, indices);