X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Funiformblock.cpp;h=cc8945cf2093358d7df19ccebfe5e92ee9fffa61;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=09060eb7622ce36d9ddf158339411d89e9445d86;hpb=6c525eff3eaaa617648a869449ed3bddf9c1936d;p=libs%2Fgl.git

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 09060eb7..cc8945cf 100644
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -15,6 +15,7 @@ namespace Msp {
 namespace GL {
 
 UniformBlock::UniformBlock():
+	size(0),
 	buf_range(0)
 {
 	static Require _req(ARB_shader_objects);
@@ -22,10 +23,13 @@ UniformBlock::UniformBlock():
 
 UniformBlock::UniformBlock(unsigned s):
 	size(s),
-	data(size),
 	buf_range(0)
 {
 	static Require _req(ARB_uniform_buffer_object);
+
+	if(!size)
+		throw invalid_argument("UniformBlock::UniformBlock");
+	data.resize(size);
 }
 
 UniformBlock::~UniformBlock()
@@ -38,47 +42,42 @@ unsigned UniformBlock::get_alignment() const
 	return BufferRange::get_uniform_buffer_alignment();
 }
 
-void UniformBlock::offset_changed()
+void UniformBlock::location_changed(Buffer *buf, unsigned off, unsigned) const
 {
 	delete buf_range;
-	buf_range = 0;
-}
-
-void UniformBlock::upload_data(char *target) const
-{
-	if(!buf_range)
-		buf_range = new BufferRange(*get_buffer(), get_offset(), size);
-
-	if(target)
-		copy(data.begin(), data.end(), target);
-	else
-		buf_range->data(&data[0]);
+	buf_range = new BufferRange(*buf, off, size);
 }
 
 void UniformBlock::attach(int index, const Uniform &uni)
 {
+	if(size)
+		throw invalid_operation("UniformBlock::attach");
+
 	uniforms[index] = &uni;
 }
 
 void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 {
-	uniforms[info.location] = &uni;
-	if(get_buffer())
+	if(size)
 	{
 		uni.store(info, &data[info.location]);
 		dirty = true;
 	}
+	else
+		uniforms[info.location] = &uni;
 }
 
 void UniformBlock::apply(int index) const
 {
-	if((index>=0) != (get_buffer()!=0))
+	if((index>=0) != (size>0))
 		throw invalid_operation("UniformBlock::apply");
 
-	if(get_buffer())
+	if(size)
 	{
-		if(dirty)
-			update_buffer();
+		if(!get_buffer())
+			throw invalid_operation("UniformBlock::apply");
+
+		refresh();
 		buf_range->bind_to(UNIFORM_BUFFER, index);
 	}
 	else