X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=04fdd6b865053073435069696b968c5c90c48785;hb=8eb9a8d90e5597154dab666481037b306b7bbca2;hp=535e9e792f3b40826ab60d26bb1f72f2eca4e821;hpb=9846a5c6e73b3a146084894a11550dbbf184a22a;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 535e9e79..04fdd6b8 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,3 +1,4 @@
+#include "buffer.h"
 #include "color.h"
 #include "error.h"
 #include "extension.h"
@@ -14,6 +15,8 @@ namespace Msp {
 namespace GL {
 
 ProgramData::ProgramData():
+	last_block(0),
+	buffer(0),
 	modified(false)
 {
 	static RequireExtension _ext("GL_ARB_shader_objects");
@@ -22,6 +25,8 @@ ProgramData::ProgramData():
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
 	uniforms(other.uniforms),
+	last_block(0),
+	buffer(0),
 	modified(false)
 {
 	for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
@@ -62,17 +67,19 @@ void ProgramData::uniform(const string &name, float v)
 
 void ProgramData::uniform(const string &name, float v0, float v1)
 {
-	uniform(name, new Uniform2f(v0, v1));
+	float va[2] = { v0, v1 };
+	uniform2(name, va);
 }
 
 void ProgramData::uniform2(const string &name, const float *v)
 {
-	uniform(name, v[0], v[1]);
+	uniform(name, new Uniform2f(v));
 }
 
 void ProgramData::uniform(const string &name, float v0, float v1, float v2)
 {
-	uniform(name, new Uniform3f(v0, v1, v2));
+	float va[3] = { v0, v1, v2 };
+	uniform3(name, va);
 }
 
 void ProgramData::uniform(const string &name, const Vector3 &v)
@@ -82,12 +89,13 @@ void ProgramData::uniform(const string &name, const Vector3 &v)
 
 void ProgramData::uniform3(const string &name, const float *v)
 {
-	uniform(name, v[0], v[1], v[2]);
+	uniform(name, new Uniform3f(v));
 }
 
 void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3)
 {
-	uniform(name, new Uniform4f(v0, v1, v2, v3));
+	float va[4] = { v0, v1, v2, v3 };
+	uniform4(name, va);
 }
 
 void ProgramData::uniform(const string &name, const Vector4 &v)
@@ -102,7 +110,7 @@ void ProgramData::uniform(const string &name, const Color &c)
 
 void ProgramData::uniform4(const string &name, const float *v)
 {
-	uniform(name, v[0], v[1], v[2], v[3]);
+	uniform(name, new Uniform4f(v));
 }
 
 void ProgramData::uniform_matrix4(const string &name, const float *v)
@@ -117,7 +125,32 @@ void ProgramData::uniform_matrix4(const string &name, const Matrix &m)
 	uniform_matrix4(name, v);
 }
 
-const UniformBlock &ProgramData::get_block(const Program &prog) const
+void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<Uniform1f>(n, v));
+}
+
+void ProgramData::uniform2_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<Uniform2f>(n, v));
+}
+
+void ProgramData::uniform3_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<Uniform3f>(n, v));
+}
+
+void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<Uniform4f>(n, v));
+}
+
+void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
+}
+
+const UniformBlock &ProgramData::get_block(const Program &prog, const string &name) const
 {
 	if(modified)
 	{
@@ -126,23 +159,54 @@ const UniformBlock &ProgramData::get_block(const Program &prog) const
 		modified = false;
 	}
 
-	unsigned layout_hash = prog.get_uniform_layout_hash();
+	const Program::UniformBlockInfo *info = 0;
+	unsigned layout_hash;
+	if(!name.empty())
+	{
+		info = &prog.get_uniform_block_info(name);
+		layout_hash = info->layout_hash;
+	}
+	else
+		layout_hash = prog.get_uniform_layout_hash();
+
 	map<unsigned, Block>::iterator i = blocks.find(layout_hash);
 	if(i==blocks.end())
 	{
 		i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first;
 		i->second.dirty = true;
-		i->second.block = new UniformBlock;
+		if(info)
+		{
+			i->second.block = new UniformBlock(info->data_size);
+			if(!buffer)
+				buffer = new Buffer(UNIFORM_BUFFER);
+			i->second.block->use_buffer(buffer, last_block);
+			last_block = i->second.block;
+		}
+		else
+			i->second.block = new UniformBlock;
 	}
 
 	UniformBlock &block = *i->second.block;
 	if(i->second.dirty)
 	{
-		for(UniformMap::const_iterator j=uniforms.begin(); j!=uniforms.end(); ++j)
+		if(info)
+		{
+			for(vector<const Program::UniformInfo *>::const_iterator j=info->uniforms.begin(); j!=info->uniforms.end(); ++j)
+			{
+				// XXX individual array elements
+				UniformMap::const_iterator k = uniforms.find((*j)->name);
+				if(k!=uniforms.end())
+					block.attach(**j, *k->second);
+			}
+		}
+		else
 		{
-			int loc = prog.get_uniform_location(j->first);
-			if(loc>=0)
-				block.uniform(loc, *j->second);
+			for(UniformMap::const_iterator j=uniforms.begin(); j!=uniforms.end(); ++j)
+			{
+				int loc = prog.get_uniform_location(j->first);
+				if(loc>=0)
+					block.attach(loc, *j->second);
+			}
 		}
 		i->second.dirty = false;
 	}
@@ -156,7 +220,14 @@ void ProgramData::apply() const
 	if(!prog)
 		throw invalid_operation("ProgramData::apply");
 
-	const UniformBlock &block = get_block(*prog);
+	const Program::UniformBlockMap &prog_blocks = prog->get_uniform_blocks();
+	for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i)
+	{
+		const UniformBlock &block = get_block(*prog, i->second.name);
+		block.apply(i->second.bind_point);
+	}
+
+	const UniformBlock &block = get_block(*prog, string());
 	block.apply(-1);
 }