X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=cd12c2ca47fbff99cdbfe2578d30ebbd0468d997;hp=9b27af5031070c389e7c232af1cf56606b33db31;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=7a7e1c4c249c4e8a3287d07f81a9f0fa944f894b

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 9b27af50..cd12c2ca 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,3 +1,5 @@
+#include <msp/core/maputils.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -13,7 +15,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ProgramData::ProgramData():
+ProgramData::ProgramData(const Program *p):
+	tied_program(p),
 	last_block(0),
 	buffer(0),
 	dirty(0)
@@ -21,6 +24,7 @@ ProgramData::ProgramData():
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
+	tied_program(0),
 	uniform_slots(other.uniform_slots),
 	uniforms(other.uniforms),
 	last_block(0),
@@ -37,6 +41,8 @@ ProgramData &ProgramData::operator=(const ProgramData &other)
 		delete *i;
 	uniforms.clear();
 
+	tied_program = other.tied_program;
+
 	uniform_slots = other.uniform_slots;
 	for(vector<Uniform *>::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
 		uniforms.push_back((*i)->clone());
@@ -63,8 +69,18 @@ ProgramData::~ProgramData()
 
 void ProgramData::uniform(const string &name, Uniform *uni)
 {
-	if(name[name.size()-1]==']')
-		throw invalid_argument("ProgramData::uniform");
+	try
+	{
+		if(tied_program)
+			tied_program->get_uniform_info(name);
+		else if(name[name.size()-1]==']')
+			throw invalid_argument("ProgramData::uniform");
+	}
+	catch(...)
+	{
+		delete uni;
+		throw;
+	}
 
 	SlotMap::iterator i = uniform_slots.find(name);
 	if(i!=uniform_slots.end())
@@ -89,6 +105,11 @@ void ProgramData::uniform(const string &name, Uniform *uni)
 	}
 }
 
+void ProgramData::uniform(const string &name, const Uniform &u)
+{
+	uniform(name, u.clone());
+}
+
 void ProgramData::uniform(const string &name, int v)
 {
 	uniform(name, new Uniform1i(v));
@@ -99,17 +120,34 @@ void ProgramData::uniform(const string &name, float v)
 	uniform(name, new Uniform1f(v));
 }
 
+void ProgramData::uniform(const string &name, int v0, int v1)
+{
+	int va[2] = { v0, v1 };
+	uniform2(name, va);
+}
+
 void ProgramData::uniform(const string &name, float v0, float v1)
 {
 	float va[2] = { v0, v1 };
 	uniform2(name, va);
 }
 
+void ProgramData::uniform2(const string &name, const int *v)
+{
+	uniform(name, new Uniform2i(v));
+}
+
 void ProgramData::uniform2(const string &name, const float *v)
 {
 	uniform(name, new Uniform2f(v));
 }
 
+void ProgramData::uniform(const string &name, int v0, int v1, int v2)
+{
+	int va[3] = { v0, v1, v2 };
+	uniform3(name, va);
+}
+
 void ProgramData::uniform(const string &name, float v0, float v1, float v2)
 {
 	float va[3] = { v0, v1, v2 };
@@ -121,11 +159,22 @@ void ProgramData::uniform(const string &name, const Vector3 &v)
 	uniform(name, v.x, v.y, v.z);
 }
 
+void ProgramData::uniform3(const string &name, const int *v)
+{
+	uniform(name, new Uniform3i(v));
+}
+
 void ProgramData::uniform3(const string &name, const float *v)
 {
 	uniform(name, new Uniform3f(v));
 }
 
+void ProgramData::uniform(const string &name, int v0, int v1, int v2, int v3)
+{
+	int va[4] = { v0, v1, v2, v3 };
+	uniform4(name, va);
+}
+
 void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3)
 {
 	float va[4] = { v0, v1, v2, v3 };
@@ -142,6 +191,11 @@ void ProgramData::uniform(const string &name, const Color &c)
 	uniform(name, c.r, c.g, c.b, c.a);
 }
 
+void ProgramData::uniform4(const string &name, const int *v)
+{
+	uniform(name, new Uniform4i(v));
+}
+
 void ProgramData::uniform4(const string &name, const float *v)
 {
 	uniform(name, new Uniform4f(v));
@@ -187,32 +241,91 @@ 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 int *v)
+{
+	uniform(name, new UniformArray<Uniform2i>(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 int *v)
+{
+	uniform(name, new UniformArray<Uniform3i>(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 int *v)
+{
+	uniform(name, new UniformArray<Uniform4i>(n, v));
+}
+
 void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<Uniform4f>(n, v));
 }
 
+void ProgramData::uniform_matrix2_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<UniformMatrix2x2f>(n, v));
+}
+
+void ProgramData::uniform_matrix3_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<UniformMatrix3x3f>(n, v));
+}
+
 void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
 }
 
+void ProgramData::remove_uniform(const string &name)
+{
+	SlotMap::iterator i = uniform_slots.find(name);
+	if(i!=uniform_slots.end())
+	{
+		vector<Uniform *>::iterator j = uniforms.begin()+i->second;
+		delete *j;
+		uniforms.erase(j);
+
+		for(SlotMap::iterator k=uniform_slots.begin(); k!=uniform_slots.end(); ++k)
+			if(k->second>i->second)
+				--k->second;
+
+		uniform_slots.erase(i);
+
+		dirty = ALL_ONES;
+	}
+}
+
+vector<string> ProgramData::get_uniform_names() const
+{
+	vector<string> names;
+	for(SlotMap::const_iterator i=uniform_slots.begin(); i!=uniform_slots.end(); ++i)
+		names.push_back(i->first);
+	return names;
+}
+
+const Uniform &ProgramData::get_uniform(const string &name) const
+{
+	return *uniforms[get_item(uniform_slots, name)];
+}
+
 unsigned ProgramData::compute_slot_mask(const Program::UniformBlockInfo &block) const
 {
 	unsigned mask = 0;
 	for(vector<const Program::UniformInfo *>::const_iterator i=block.uniforms.begin(); i!=block.uniforms.end(); ++i)
 	{
 		SlotMap::const_iterator j = uniform_slots.find((*i)->name);
+		/* TODO issue a warning (or even error?) either here or in update_block
+		if all uniforms for a buffer-backed block are not found */
 		if(j!=uniform_slots.end() && j->second<MASK_BITS)
 			mask |= 1<<j->second;
 	}
@@ -327,7 +440,7 @@ void ProgramData::apply() const
 
 		/* If any blocks stored in the buffer were updated, bind the buffer here
 		to avoid state thrashing. */
-		if(buffered_blocks_updated)
+		if(buffered_blocks_updated && !ARB_direct_state_access)
 			buffer->bind();
 	}
 
@@ -352,7 +465,7 @@ ProgramData::ProgramBlock::ProgramBlock():
 
 ProgramData::ProgramBlock::ProgramBlock(int p, SharedBlock *b):
 	bind_point(p),
-	block(b ? b->block : 0),
+	block((b && b->used) ? b->block : 0),
 	shared(b)
 { }
 
@@ -370,12 +483,24 @@ ProgramData::Loader::Loader(ProgramData &pd):
 	add("uniform1i", &Loader::uniform1i);
 	add("uniform", &Loader::uniform1f);
 	add("uniform1f", &Loader::uniform1f);
+	add("uniform", &Loader::uniform2i);
+	add("uniform2i", &Loader::uniform2i);
 	add("uniform", &Loader::uniform2f);
 	add("uniform2f", &Loader::uniform2f);
+	add("uniform", &Loader::uniform3i);
+	add("uniform3i", &Loader::uniform3i);
 	add("uniform", &Loader::uniform3f);
 	add("uniform3f", &Loader::uniform3f);
+	add("uniform", &Loader::uniform4i);
+	add("uniform4i", &Loader::uniform4i);
 	add("uniform", &Loader::uniform4f);
 	add("uniform4f", &Loader::uniform4f);
+	add("uniform1i_array", &Loader::uniform1i_array);
+	add("uniform1f_array", &Loader::uniform1f_array);
+	add("uniform2f_array", &Loader::uniform2f_array);
+	add("uniform3f_array", &Loader::uniform3f_array);
+	add("uniform4f_array", &Loader::uniform4f_array);
+	add("uniform_array", &Loader::uniform_array);
 }
 
 void ProgramData::Loader::uniform1i(const string &n, int v)
@@ -388,20 +513,200 @@ void ProgramData::Loader::uniform1f(const string &n, float v)
 	obj.uniform(n, v);
 }
 
+void ProgramData::Loader::uniform2i(const string &n, int v0, int v1)
+{
+	obj.uniform(n, v0, v1);
+}
+
 void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
 {
 	obj.uniform(n, v0, v1);
 }
 
+void ProgramData::Loader::uniform3i(const string &n, int v0, int v1, int v2)
+{
+	obj.uniform(n, v0, v1, v2);
+}
+
 void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
 {
 	obj.uniform(n, v0, v1, v2);
 }
 
+void ProgramData::Loader::uniform4i(const string &n, int v0, int v1, int v2, int v3)
+{
+	obj.uniform(n, v0, v1, v2, v3);
+}
+
 void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
 {
 	obj.uniform(n, v0, v1, v2, v3);
 }
 
+void ProgramData::Loader::uniform_array_(const string &n, DataType t, unsigned e)
+{
+	ArrayLoader ldr(t, e);
+	load_sub_with(ldr);
+	unsigned size = ldr.get_size();
+	if(!size)
+		throw logic_error("empty uniform array");
+
+	DataType type = ldr.get_data_type();
+	unsigned elem_size = ldr.get_element_size();
+	if(type==INT)
+	{
+		const int *data = reinterpret_cast<const int *>(ldr.get_data());
+		if(elem_size==1)
+			obj.uniform1_array(n, size, data);
+		else if(elem_size==2)
+			obj.uniform2_array(n, size, data);
+		else if(elem_size==3)
+			obj.uniform3_array(n, size, data);
+		else if(elem_size==4)
+			obj.uniform4_array(n, size, data);
+		else
+			throw logic_error("unsupported combination of array type and element size");
+	}
+	else if(type==FLOAT)
+	{
+		const float *data = reinterpret_cast<const float *>(ldr.get_data());
+		if(elem_size==1)
+			obj.uniform1_array(n, size, data);
+		else if(elem_size==2)
+			obj.uniform2_array(n, size, data);
+		else if(elem_size==3)
+			obj.uniform3_array(n, size, data);
+		else if(elem_size==4)
+			obj.uniform4_array(n, size, data);
+		else
+			throw logic_error("unsupported combination of array type and element size");
+	}
+	else
+		throw logic_error("unsupported array type");
+}
+
+void ProgramData::Loader::uniform1i_array(const string &n)
+{
+	uniform_array_(n, INT, 1);
+}
+
+void ProgramData::Loader::uniform1f_array(const string &n)
+{
+	uniform_array_(n, FLOAT, 1);
+}
+
+void ProgramData::Loader::uniform2i_array(const string &n)
+{
+	uniform_array_(n, INT, 2);
+}
+
+void ProgramData::Loader::uniform2f_array(const string &n)
+{
+	uniform_array_(n, FLOAT, 2);
+}
+
+void ProgramData::Loader::uniform3i_array(const string &n)
+{
+	uniform_array_(n, INT, 3);
+}
+
+void ProgramData::Loader::uniform3f_array(const string &n)
+{
+	uniform_array_(n, FLOAT, 3);
+}
+
+void ProgramData::Loader::uniform4i_array(const string &n)
+{
+	uniform_array_(n, INT, 4);
+}
+
+void ProgramData::Loader::uniform4f_array(const string &n)
+{
+	uniform_array_(n, FLOAT, 4);
+}
+
+void ProgramData::Loader::uniform_array(const string &n)
+{
+	uniform_array_(n, static_cast<DataType>(0), 0);
+}
+
+
+ProgramData::ArrayLoader::ArrayLoader(DataType t, unsigned e):
+	type(t),
+	element_size(e)
+{
+	add("uniform", &ArrayLoader::uniform1i);
+	add("uniform1i", &ArrayLoader::uniform1i);
+	add("uniform", &ArrayLoader::uniform1f);
+	add("uniform1f", &ArrayLoader::uniform1f);
+	add("uniform", &ArrayLoader::uniform2f);
+	add("uniform2f", &ArrayLoader::uniform2f);
+	add("uniform", &ArrayLoader::uniform3f);
+	add("uniform3f", &ArrayLoader::uniform3f);
+	add("uniform", &ArrayLoader::uniform4f);
+	add("uniform4f", &ArrayLoader::uniform4f);
+}
+
+void ProgramData::ArrayLoader::uniform(DataType t, unsigned e, const void *v)
+{
+	if(element_size && (t!=type || e!=element_size))
+		throw logic_error("heterogeneous array contents");
+
+	if(!element_size)
+	{
+		type = t;
+		element_size = e;
+	}
+
+	const char *cv = reinterpret_cast<const char *>(v);
+	data.insert(data.end(), cv, cv+element_size*4);
+}
+
+void ProgramData::ArrayLoader::uniform1i(int v)
+{
+	uniform(INT, 1, &v);
+}
+
+void ProgramData::ArrayLoader::uniform1f(float v)
+{
+	uniform(FLOAT, 1, &v);
+}
+
+void ProgramData::ArrayLoader::uniform2i(int v0, int v1)
+{
+	int va[2] = { v0, v1 };
+	uniform(INT, 2, va);
+}
+
+void ProgramData::ArrayLoader::uniform2f(float v0, float v1)
+{
+	float va[2] = { v0, v1 };
+	uniform(FLOAT, 2, va);
+}
+
+void ProgramData::ArrayLoader::uniform3i(int v0, int v1, int v2)
+{
+	int va[3] = { v0, v1, v2 };
+	uniform(INT, 3, va);
+}
+
+void ProgramData::ArrayLoader::uniform3f(float v0, float v1, float v2)
+{
+	float va[3] = { v0, v1, v2 };
+	uniform(FLOAT, 3, va);
+}
+
+void ProgramData::ArrayLoader::uniform4i(int v0, int v1, int v2, int v3)
+{
+	int va[4] = { v0, v1, v2, v3 };
+	uniform(INT, 4, va);
+}
+
+void ProgramData::ArrayLoader::uniform4f(float v0, float v1, float v2, float v3)
+{
+	float va[4] = { v0, v1, v2, v3 };
+	uniform(FLOAT, 4, va);
+}
+
 } // namespace GL
 } // namespace Msp