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

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 2ff00fa2..2b9a135c 100644
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -1,5 +1,7 @@
 #include <stdexcept>
+#include "buffer.h"
 #include "color.h"
+#include "error.h"
 #include "matrix.h"
 #include "uniform.h"
 #include "uniformblock.h"
@@ -10,18 +12,49 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+UniformBlock::UniformBlock()
+{ }
+
+UniformBlock::UniformBlock(unsigned s):
+	size(s),
+	data(size)
+{ }
+
 void UniformBlock::attach(int index, const Uniform &uni)
 {
 	uniforms[index] = &uni;
 }
 
+void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
+{
+	uniforms[info.location] = &uni;
+	if(buffer)
+	{
+		uni.store(info, &data[info.location]);
+		dirty = true;
+	}
+}
+
 void UniformBlock::apply(int index) const
 {
-	if(index>=0)
-		throw logic_error("GL_ARB_uniform_buffer_object support not implemented yet");
+	if((index>=0) != (buffer!=0))
+		throw invalid_operation("UniformBlock::apply");
 
-	for(map<int, const Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-		i->second->apply(i->first);
+	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
+	{
+		for(map<int, const Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+			i->second->apply(i->first);
+	}
 }
 
 } // namespace GL