X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=0beb9e7f6cb85d1f095def0cbe93063c64dd0a62;hb=259254bc46e3aec6f719e1aea5e4936569c15b6e;hp=e1b4212e9d89588f78a42baf2d3e45d5a5a321db;hpb=ab83db6f1e31d44ced585119a57fd10896e469cb;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index e1b4212e..0beb9e7f 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,7 +1,6 @@
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
-#include "extension.h"
 #include "matrix.h"
 #include "program.h"
 #include "programdata.h"
@@ -17,28 +16,45 @@ namespace GL {
 ProgramData::ProgramData():
 	last_block(0),
 	buffer(0),
-	modified(false)
-{
-	static RequireExtension _ext("GL_ARB_shader_objects");
-}
+	changes(NO_CHANGES)
+{ }
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
 	uniforms(other.uniforms),
 	last_block(0),
 	buffer(0),
-	modified(false)
+	changes(NO_CHANGES)
 {
 	for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
 		i->second = i->second->clone();
 }
 
+ProgramData &ProgramData::operator=(const ProgramData &other)
+{
+	for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+		delete i->second;
+	uniforms.clear();
+
+	for(UniformMap::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
+		uniforms.insert(uniforms.end(), UniformMap::value_type(i->first, i->second->clone()));
+
+	for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		delete i->second.block;
+	blocks.clear();
+
+	changes = NO_CHANGES;
+
+	return *this;
+}
+
 ProgramData::~ProgramData()
 {
 	for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
 		delete i->second;
 	for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		delete i->second.block;
+	delete buffer;
 }
 
 void ProgramData::uniform(const string &name, Uniform *uni)
@@ -46,13 +62,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)
@@ -113,16 +134,24 @@ void ProgramData::uniform4(const string &name, const float *v)
 	uniform(name, new Uniform4f(v));
 }
 
-void ProgramData::uniform_matrix4(const string &name, const float *v)
+void ProgramData::uniform_matrix2(const string &name, const float *v)
 {
-	uniform(name, new UniformMatrix4x4f(v));
+	uniform(name, new UniformMatrix2x2f(v));
 }
 
-void ProgramData::uniform_matrix4(const string &name, const Matrix &m)
+void ProgramData::uniform_matrix3(const string &name, const float *v)
+{
+	uniform(name, new UniformMatrix3x3f(v));
+}
+
+void ProgramData::uniform(const string &name, const Matrix &m)
+{
+	uniform_matrix4(name, m.data());
+}
+
+void ProgramData::uniform_matrix4(const string &name, const float *v)
 {
-	float v[16];
-	copy(m.data(), m.data()+16, v);
-	uniform_matrix4(name, v);
+	uniform(name, new UniformMatrix4x4f(v));
 }
 
 void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
@@ -150,45 +179,94 @@ void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const fl
 	uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
 }
 
-const UniformBlock &ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const
+void ProgramData::find_uniforms_for_block(Block &block, const Program::UniformBlockInfo &info) const
 {
-	if(modified)
+	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);
+		buffer->set_usage(STREAM_DRAW);
+	}
+	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(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 = (info ? info->layout_hash : prog.get_uniform_layout_hash());
+	Program::LayoutHash layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
 
-	map<unsigned, Block>::iterator i = blocks.find(layout_hash);
+	map<Program::LayoutHash, 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;
 		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;
+			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)
 	{
 		if(info)
 		{
-			for(vector<const Program::UniformInfo *>::const_iterator j=info->uniforms.begin(); j!=info->uniforms.end(); ++j)
+			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())
 			{
-				// XXX individual array elements
-				UniformMap::const_iterator k = uniforms.find((*j)->name);
-				if(k!=uniforms.end())
-					block.attach(**j, *k->second);
+				if(k->first==(*j)->location)
+				{
+					block.attach(**j, **k->second);
+					++k;
+				}
+				++j;
 			}
 		}
 		else
@@ -200,13 +278,13 @@ const UniformBlock &ProgramData::get_block(const Program &prog, const Program::U
 					block.attach(loc, *j->second);
 			}
 		}
-		i->second.dirty = false;
+		i->second.changes = NO_CHANGES;
 	}
 
-	return block;
+	return &block;
 }
 
-const UniformBlock &ProgramData::get_block(const Program &prog, const string &name) const
+const UniformBlock *ProgramData::get_block(const Program &prog, const string &name) const
 {
 	if(name.empty())
 		return get_block(prog, 0);
@@ -226,10 +304,8 @@ void ProgramData::apply() const
 		typedef pair<const UniformBlock *, unsigned> ApplyBlock;
 		list<ApplyBlock> apply_blocks;
 		for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i)
-		{
-			const UniformBlock &block = get_block(*prog, &i->second);
-			apply_blocks.push_back(make_pair(&block, i->second.bind_point));
-		}
+			if(const UniformBlock *block = get_block(*prog, &i->second))
+				apply_blocks.push_back(make_pair(block, i->second.bind_point));
 
 		if(buffer)
 			buffer->bind();
@@ -238,13 +314,13 @@ void ProgramData::apply() const
 			i->first->apply(i->second);
 	}
 
-	const UniformBlock &block = get_block(*prog, 0);
-	block.apply(-1);
+	if(const UniformBlock *block = get_block(*prog, 0))
+		block->apply(-1);
 }
 
 
 ProgramData::Block::Block():
-	dirty(false),
+	changes(NO_CHANGES),
 	block(0)
 { }