X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=bdbe4c1d9e4427721e73096a7b74570e73d26786;hb=9b2e1d2c6fe27574f10016b154dddad4f511996d;hp=f3f498f3e948966d9e1dd3524175b1d0ddc5060e;hpb=7c1559dec950966d9c45e0b5db6685a9c6a324ce;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index f3f498f3..bdbe4c1d 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"
@@ -18,9 +17,7 @@ ProgramData::ProgramData():
 	last_block(0),
 	buffer(0),
 	changes(NO_CHANGES)
-{
-	static RequireExtension _ext("GL_ARB_shader_objects");
-}
+{ }
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
@@ -33,6 +30,24 @@ ProgramData::ProgramData(const ProgramData &other):
 		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)
@@ -119,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_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 Matrix &m)
+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)