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

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index fe044750..be30ce5b 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,106 +14,89 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-UniformBlock::~UniformBlock()
-{
-	for(map<int, Uniform *>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-		delete i->second;
-}
-
-void UniformBlock::uniform(int index, Uniform *uni)
-{
-	map<int, Uniform *>::iterator i = uniforms.find(index);
-	if(i!=uniforms.end())
-	{
-		delete i->second;
-		i->second = uni;
-	}
-	else
-		uniforms[index] = uni;
-}
-
-void UniformBlock::uniform(int index, const Uniform &uni)
-{
-	uniform(index, uni.clone());
-}
-
-void UniformBlock::uniform(int index, int v)
-{
-	uniform(index, new Uniform1i(v));
-}
-
-void UniformBlock::uniform(int index, float v)
-{
-	uniform(index, new Uniform1f(v));
-}
-
-void UniformBlock::uniform(int index, float v0, float v1)
+UniformBlock::UniformBlock():
+	size(0),
+	buf_range(0)
 {
-	float va[2] = { v0, v1 };
-	uniform2(index, va);
+	static Require _req(ARB_shader_objects);
 }
 
-void UniformBlock::uniform2(int index, const float *v)
+UniformBlock::UniformBlock(unsigned s):
+	size(s),
+	buf_range(0)
 {
-	uniform(index, new Uniform2f(v));
-}
+	static Require _req(ARB_uniform_buffer_object);
 
-void UniformBlock::uniform(int index, float v0, float v1, float v2)
-{
-	float va[3] = { v0, v1, v2 };
-	uniform3(index, va);
+	if(!size)
+		throw invalid_argument("UniformBlock::UniformBlock");
+	data.resize(size);
 }
 
-void UniformBlock::uniform(int index, const Vector3 &v)
+UniformBlock::~UniformBlock()
 {
-	uniform(index, v.x, v.y, v.z);
+	delete buf_range;
 }
 
-void UniformBlock::uniform3(int index, const float *v)
+unsigned UniformBlock::get_alignment() const
 {
-	uniform(index, new Uniform3f(v));
+	return BufferRange::get_uniform_buffer_alignment();
 }
 
-void UniformBlock::uniform(int index, float v0, float v1, float v2, float v3)
+void UniformBlock::offset_changed()
 {
-	float va[4] = { v0, v1, v2, v3 };
-	uniform4(index, va);
+	delete buf_range;
+	buf_range = 0;
 }
 
-void UniformBlock::uniform(int index, const Vector4 &v)
+void UniformBlock::upload_data(char *target) const
 {
-	uniform(index, v.x, v.y, v.z, v.w);
-}
+	if(!buf_range)
+		buf_range = new BufferRange(*get_buffer(), get_offset(), size);
 
-void UniformBlock::uniform(int index, const Color &c)
-{
-	uniform(index, c.r, c.g, c.b, c.a);
+	if(target)
+		copy(data.begin(), data.end(), target);
+	else
+		buf_range->data(&data[0]);
 }
 
-void UniformBlock::uniform4(int index, const float *v)
+void UniformBlock::attach(int index, const Uniform &uni)
 {
-	uniform(index, new Uniform4f(v));
-}
+	if(size)
+		throw invalid_operation("UniformBlock::attach");
 
-void UniformBlock::uniform_matrix4(int index, const float *v)
-{
-	uniform(index, new UniformMatrix4x4f(v));
+	uniforms[index] = &uni;
 }
 
-void UniformBlock::uniform_matrix4(int index, const Matrix &m)
+void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 {
-	float v[16];
-	copy(m.data(), m.data()+16, v);
-	uniform_matrix4(index, v);
+	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, Uniform *>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-		i->second->apply(i->first);
+		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