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

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index a87a6a42..be30ce5b 100644
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -1,4 +1,6 @@
 #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"
@@ -13,14 +15,22 @@ namespace Msp {
 namespace GL {
 
 UniformBlock::UniformBlock():
+	size(0),
 	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);
+
+	if(!size)
+		throw invalid_argument("UniformBlock::UniformBlock");
+	data.resize(size);
+}
 
 UniformBlock::~UniformBlock()
 {
@@ -38,37 +48,48 @@ void UniformBlock::offset_changed()
 	buf_range = 0;
 }
 
-void UniformBlock::upload_data() const
+void UniformBlock::upload_data(char *target) const
 {
 	if(!buf_range)
-		buf_range = new BufferRange(*buffer, buffer_offset, size);
-	buf_range->data(&data[0]);
+		buf_range = new BufferRange(*get_buffer(), get_offset(), size);
+
+	if(target)
+		copy(data.begin(), data.end(), target);
+	else
+		buf_range->data(&data[0]);
 }
 
 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)
 {
-	uniforms[info.location] = &uni;
-	if(buffer)
+	if(size)
 	{
 		uni.store(info, &data[info.location]);
 		dirty = true;
 	}
+	else
+		uniforms[info.location] = &uni;
 }
 
 void UniformBlock::apply(int index) const
 {
-	if((index>=0) != (buffer!=0))
+	if((index>=0) != (size>0))
 		throw invalid_operation("UniformBlock::apply");
 
-	if(buffer)
+	if(size)
 	{
+		if(!get_buffer())
+			throw invalid_operation("UniformBlock::apply");
+
 		if(dirty)
-			update_buffer_data();
+			update_buffer();
 		buf_range->bind_to(UNIFORM_BUFFER, index);
 	}
 	else