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

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 535e9e79..7334596c 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,7 +15,9 @@ namespace Msp {
 namespace GL {
 
 ProgramData::ProgramData():
-	modified(false)
+	last_block(0),
+	buffer(0),
+	changes(NO_CHANGES)
 {
 	static RequireExtension _ext("GL_ARB_shader_objects");
 }
@@ -22,7 +25,9 @@ ProgramData::ProgramData():
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
 	uniforms(other.uniforms),
-	modified(false)
+	last_block(0),
+	buffer(0),
+	changes(NO_CHANGES)
 {
 	for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
 		i->second = i->second->clone();
@@ -41,13 +46,18 @@ void ProgramData::uniform(const string &name, Uniform *uni)
 	UniformMap::iterator i = uniforms.find(name);
 	if(i!=uniforms.end())
 	{
+		/* UniformBlock does not copy the uniforms, so existing blocks will be
+		left with stale pointers.  This is not a problem as long as no one stores
+		pointers to the blocks and expects them to stay valid. */
 		delete i->second;
 		i->second = uni;
+		changes = VALUES_CHANGED;
 	}
 	else
+	{
 		uniforms[name] = uni;
-
-	modified = true;
+		changes = KEYS_CHANGED;
+	}
 }
 
 void ProgramData::uniform(const string &name, int v)
@@ -62,17 +72,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 +94,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 +115,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,37 +130,139 @@ 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));
+}
+
+void ProgramData::find_uniforms_for_block(Block &block, const Program::UniformBlockInfo &info) const
+{
+	block.uniforms.clear();
+	for(vector<const Program::UniformInfo *>::const_iterator i=info.uniforms.begin(); i!=info.uniforms.end(); ++i)
+	{
+		// XXX individual array elements
+		UniformMap::const_iterator j = uniforms.find((*i)->name);
+		if(j!=uniforms.end())
+			block.uniforms[(*i)->location] = &j->second;
+	}
+}
+
+UniformBlock *ProgramData::create_block(const Program::UniformBlockInfo &info) const
+{
+	UniformBlock *block = new UniformBlock(info.data_size);
+	if(!buffer)
+		buffer = new Buffer(UNIFORM_BUFFER);
+	block->use_buffer(buffer, last_block);
+	last_block = block;
+	return block;
+}
+
+const UniformBlock *ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const
 {
-	if(modified)
+	if(changes)
 	{
 		for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-			i->second.dirty = true;
-		modified = false;
+			if(i->second.changes<changes)
+				i->second.changes = changes;
+		changes = NO_CHANGES;
 	}
 
-	unsigned layout_hash = prog.get_uniform_layout_hash();
+	unsigned layout_hash = (info ? info->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)
+		{
+			find_uniforms_for_block(i->second, *info);
+
+			if(!i->second.uniforms.empty())
+			{
+				i->second.block = create_block(*info);
+				i->second.changes = VALUES_CHANGED;
+			}
+		}
+		else
+		{
+			i->second.block = new UniformBlock;
+			i->second.changes = VALUES_CHANGED;
+		}
+	}
+	else if(info && i->second.changes==KEYS_CHANGED)
+	{
+		find_uniforms_for_block(i->second, *info);
+		if(!i->second.uniforms.empty())
+		{
+			if(!i->second.block)
+				i->second.block = create_block(*info);
+			i->second.changes = VALUES_CHANGED;
+		}
+		else
+			i->second.changes = NO_CHANGES;
 	}
 
+	if(!i->second.block)
+		return 0;
+
 	UniformBlock &block = *i->second.block;
-	if(i->second.dirty)
+	if(i->second.changes)
 	{
-		for(UniformMap::const_iterator j=uniforms.begin(); j!=uniforms.end(); ++j)
+		if(info)
 		{
-			int loc = prog.get_uniform_location(j->first);
-			if(loc>=0)
-				block.uniform(loc, *j->second);
+			vector<const Program::UniformInfo *>::const_iterator j = info->uniforms.begin();
+			map<unsigned, const Uniform *const *>::const_iterator k = i->second.uniforms.begin();
+			while(j!=info->uniforms.end() && k!=i->second.uniforms.end())
+			{
+				if(k->first==(*j)->location)
+				{
+					block.attach(**j, **k->second);
+					++k;
+				}
+				++j;
+			}
 		}
-		i->second.dirty = false;
+		else
+		{
+			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.changes = NO_CHANGES;
 	}
 
-	return block;
+	return &block;
+}
+
+const UniformBlock *ProgramData::get_block(const Program &prog, const string &name) const
+{
+	if(name.empty())
+		return get_block(prog, 0);
+	else
+		return get_block(prog, &prog.get_uniform_block_info(name));
 }
 
 void ProgramData::apply() const
@@ -156,13 +271,29 @@ void ProgramData::apply() const
 	if(!prog)
 		throw invalid_operation("ProgramData::apply");
 
-	const UniformBlock &block = get_block(*prog);
-	block.apply(-1);
+	const Program::UniformBlockMap &prog_blocks = prog->get_uniform_blocks();
+	if(!prog_blocks.empty())
+	{
+		typedef pair<const UniformBlock *, unsigned> ApplyBlock;
+		list<ApplyBlock> apply_blocks;
+		for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i)
+			if(const UniformBlock *block = get_block(*prog, &i->second))
+				apply_blocks.push_back(make_pair(block, i->second.bind_point));
+
+		if(buffer)
+			buffer->bind();
+
+		for(list<ApplyBlock>::const_iterator i=apply_blocks.begin(); i!=apply_blocks.end(); ++i)
+			i->first->apply(i->second);
+	}
+
+	if(const UniformBlock *block = get_block(*prog, 0))
+		block->apply(-1);
 }
 
 
 ProgramData::Block::Block():
-	dirty(false),
+	changes(NO_CHANGES),
 	block(0)
 { }