X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiformblock.cpp;h=a87a6a42386ed39ee04b7368524796decd64ecfe;hb=c21d4de686e7abd51b0a779af00f06ce459e18d6;hp=2b9a135c0d8b61d9dd545c4aefeccd603f39fbf7;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2;p=libs%2Fgl.git

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 2b9a135c..a87a6a42 100644
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -12,14 +12,39 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-UniformBlock::UniformBlock()
+UniformBlock::UniformBlock():
+	buf_range(0)
 { }
 
 UniformBlock::UniformBlock(unsigned s):
 	size(s),
-	data(size)
+	data(size),
+	buf_range(0)
 { }
 
+UniformBlock::~UniformBlock()
+{
+	delete buf_range;
+}
+
+unsigned UniformBlock::get_alignment() const
+{
+	return BufferRange::get_uniform_buffer_alignment();
+}
+
+void UniformBlock::offset_changed()
+{
+	delete buf_range;
+	buf_range = 0;
+}
+
+void UniformBlock::upload_data() const
+{
+	if(!buf_range)
+		buf_range = new BufferRange(*buffer, buffer_offset, size);
+	buf_range->data(&data[0]);
+}
+
 void UniformBlock::attach(int index, const Uniform &uni)
 {
 	uniforms[index] = &uni;
@@ -43,11 +68,7 @@ void UniformBlock::apply(int index) const
 	if(buffer)
 	{
 		if(dirty)
-		{
 			update_buffer_data();
-			if(!buf_range)
-				buf_range = new BufferRange(*buffer, buffer_offset, size);
-		}
 		buf_range->bind_to(UNIFORM_BUFFER, index);
 	}
 	else