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

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 2ff00fa2..cc8945cf 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,77 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+UniformBlock::UniformBlock():
+	size(0),
+	buf_range(0)
+{
+	static Require _req(ARB_shader_objects);
+}
+
+UniformBlock::UniformBlock(unsigned s):
+	size(s),
+	buf_range(0)
+{
+	static Require _req(ARB_uniform_buffer_object);
+
+	if(!size)
+		throw invalid_argument("UniformBlock::UniformBlock");
+	data.resize(size);
+}
+
+UniformBlock::~UniformBlock()
+{
+	delete buf_range;
+}
+
+unsigned UniformBlock::get_alignment() const
+{
+	return BufferRange::get_uniform_buffer_alignment();
+}
+
+void UniformBlock::location_changed(Buffer *buf, unsigned off, unsigned) const
+{
+	delete buf_range;
+	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)
+{
+	if(size)
+	{
+		uni.store(info, &data[info.location]);
+		dirty = true;
+	}
+	else
+		uniforms[info.location] = &uni;
+}
+
 void UniformBlock::apply(int index) const
 {
-	if(index>=0)
-		throw logic_error("GL_ARB_uniform_buffer_object support not implemented yet");
+	if((index>=0) != (size>0))
+		throw invalid_operation("UniformBlock::apply");
+
+	if(size)
+	{
+		if(!get_buffer())
+			throw invalid_operation("UniformBlock::apply");
 
-	for(map<int, const Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-		i->second->apply(i->first);
+		refresh();
+		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