X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiformblock.cpp;h=6b9de26931995e46446ef52e4dd57c81a3381ca0;hb=900cf40469972b1f32a6dbac95c42f46c3726fa8;hp=6ea0d320c5b50d1f9e5cf352a0dd78871465b879;hpb=f6e51c2f771726eec73b07824ebde2cf8bd522f0;p=libs%2Fgl.git

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 6ea0d320..6b9de269 100644
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -27,6 +27,11 @@ UniformBlock::~UniformBlock()
 	delete buf_range;
 }
 
+unsigned UniformBlock::get_alignment() const
+{
+	return BufferRange::get_uniform_buffer_alignment();
+}
+
 void UniformBlock::offset_changed()
 {
 	delete buf_range;
@@ -36,7 +41,7 @@ void UniformBlock::offset_changed()
 void UniformBlock::upload_data() const
 {
 	if(!buf_range)
-		buf_range = new BufferRange(*buffer, buffer_offset, size);
+		buf_range = new BufferRange(*get_buffer(), get_offset(), size);
 	buf_range->data(&data[0]);
 }
 
@@ -48,7 +53,7 @@ void UniformBlock::attach(int index, const Uniform &uni)
 void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 {
 	uniforms[info.location] = &uni;
-	if(buffer)
+	if(get_buffer())
 	{
 		uni.store(info, &data[info.location]);
 		dirty = true;
@@ -57,13 +62,13 @@ void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 
 void UniformBlock::apply(int index) const
 {
-	if((index>=0) != (buffer!=0))
+	if((index>=0) != (get_buffer()!=0))
 		throw invalid_operation("UniformBlock::apply");
 
-	if(buffer)
+	if(get_buffer())
 	{
 		if(dirty)
-			update_buffer_data();
+			update_buffer();
 		buf_range->bind_to(UNIFORM_BUFFER, index);
 	}
 	else