X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=65e660f038949aa41353eb287382901a28918f25;hb=d147aa8f56e6a60d80f628ffeedf16bc99b588d3;hp=7705fac9786420bf47b5fc02edf088cd54b64ec5;hpb=5ae4b0008b25072b5716f0cb585133315625a661;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 7705fac9..65e660f0 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -21,6 +21,7 @@ ProgramData::ProgramData():
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
+	uniform_slots(other.uniform_slots),
 	uniforms(other.uniforms),
 	last_block(0),
 	buffer(0),
@@ -36,6 +37,7 @@ ProgramData &ProgramData::operator=(const ProgramData &other)
 		delete *i;
 	uniforms.clear();
 
+	uniform_slots = other.uniform_slots;
 	for(vector<Uniform *>::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
 		uniforms.push_back((*i)->clone());
 
@@ -61,6 +63,9 @@ ProgramData::~ProgramData()
 
 void ProgramData::uniform(const string &name, Uniform *uni)
 {
+	if(name[name.size()-1]==']')
+		throw invalid_argument("ProgramData::uniform");
+
 	SlotMap::iterator i = uniform_slots.find(name);
 	if(i!=uniform_slots.end())
 	{
@@ -142,11 +147,21 @@ void ProgramData::uniform4(const string &name, const float *v)
 	uniform(name, new Uniform4f(v));
 }
 
+void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 2> &m)
+{
+	uniform_matrix2(name, &m(0, 0));
+}
+
 void ProgramData::uniform_matrix2(const string &name, const float *v)
 {
 	uniform(name, new UniformMatrix2x2f(v));
 }
 
+void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 3> &m)
+{
+	uniform_matrix3(name, &m(0, 0));
+}
+
 void ProgramData::uniform_matrix3(const string &name, const float *v)
 {
 	uniform(name, new UniformMatrix3x3f(v));