X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiformblock.cpp;h=498973f91de39dccf64512a00e0eceb1b3b2d63b;hb=9b2e1d2c6fe27574f10016b154dddad4f511996d;hp=2ff00fa221295ada6f8578cc89649b6936c70afe;hpb=8c24084524198e23d65058454001ffb0bf20e94f;p=libs%2Fgl.git

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 2ff00fa2..498973f9 100644
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -1,5 +1,9 @@
 #include <stdexcept>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include "buffer.h"
 #include "color.h"
+#include "error.h"
 #include "matrix.h"
 #include "uniform.h"
 #include "uniformblock.h"
@@ -10,18 +14,74 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+UniformBlock::UniformBlock():
+	buf_range(0)
+{
+	static Require _req(ARB_shader_objects);
+}
+
+UniformBlock::UniformBlock(unsigned s):
+	size(s),
+	data(size),
+	buf_range(0)
+{
+	static Require _req(ARB_uniform_buffer_object);
+}
+
+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(*get_buffer(), get_offset(), size);
+	buf_range->data(&data[0]);
+}
+
 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(get_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) != (get_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(get_buffer())
+	{
+		if(dirty)
+			update_buffer();
+		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