X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fbuffer.cpp;h=dcb83a7a5960f1cb48436cb9cff5063327c4d5f2;hp=71ab6e2387a4d451e3a70c8d76a828cd6a598176;hb=ada4b7614137221b64a00f31fde1498064e9fb19;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3

diff --git a/source/core/buffer.cpp b/source/core/buffer.cpp
index 71ab6e23..dcb83a7a 100644
--- a/source/core/buffer.cpp
+++ b/source/core/buffer.cpp
@@ -17,8 +17,7 @@ namespace GL {
 Buffer *Buffer::scratch_binding = 0;
 
 Buffer::Buffer():
-	size(0),
-	allocated(false)
+	size(0)
 {
 	static Require _req(ARB_vertex_buffer_object);
 
@@ -47,14 +46,6 @@ void Buffer::storage(unsigned sz)
 		throw invalid_argument("Buffer::storage");
 
 	size = sz;
-}
-
-void Buffer::allocate()
-{
-	if(size==0)
-		throw invalid_operation("Buffer::allocate");
-	if(allocated)
-		return;
 
 	if(ARB_buffer_storage)
 	{
@@ -66,30 +57,19 @@ void Buffer::allocate()
 			bind_scratch();
 			glBufferStorage(GL_ARRAY_BUFFER, size, 0, flags);
 		}
-
-		allocated = true;
 	}
-	else
-		data(0);
-}
-
-void Buffer::data(const void *d)
-{
-	if(size==0)
-		throw invalid_operation("Buffer::data");
-
-	if(ARB_buffer_storage)
-		return sub_data(0, size, d);
-
-	if(ARB_direct_state_access)
-		glNamedBufferData(id, size, d, GL_STATIC_DRAW);
+	else if(ARB_direct_state_access)
+		glNamedBufferData(id, size, 0, GL_STATIC_DRAW);
 	else
 	{
 		bind_scratch();
-		glBufferData(GL_ARRAY_BUFFER, size, d, GL_STATIC_DRAW);
+		glBufferData(GL_ARRAY_BUFFER, size, 0, GL_STATIC_DRAW);
 	}
+}
 
-	allocated = true;
+void Buffer::data(const void *d)
+{
+	return sub_data(0, size, d);
 }
 
 void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
@@ -97,8 +77,6 @@ void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 	if(size==0)
 		throw invalid_operation("Buffer::sub_data");
 
-	allocate();
-
 	if(ARB_direct_state_access)
 		glNamedBufferSubData(id, off, sz, d);
 	else
@@ -118,7 +96,6 @@ void *Buffer::map()
 {
 	static Require _req(ARB_map_buffer_range);
 
-	allocate();
 	if(ARB_direct_state_access)
 		return glMapNamedBufferRange(id, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
 	else