X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=9ab0731d8164852352f12f38808e36a2f7aed37d;hb=249ce48a66074d0f0b6e23caeb77fad7c3d238ae;hp=2a8b5970c86edfd3054d4931946dbb40c5bf7746;hpb=0f3ae7cf6aed59f07895dfbef6740be3b666fc20;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 2a8b5970..9ab0731d 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -17,7 +17,14 @@ namespace GL {
 
 ProgramData::ProgramData()
 {
-	require_extension("GL_ARB_shader_objects");
+	static RequireExtension _ext("GL_ARB_shader_objects");
+}
+
+ProgramData::ProgramData(const ProgramData &other):
+	data(other.data)
+{
+	for(map<int, Uniform *>::iterator i=data.begin(); i!=data.end(); ++i)
+		i->second = i->second->clone();
 }
 
 ProgramData::~ProgramData()
@@ -34,14 +41,14 @@ void ProgramData::uniform(int index, Uniform *uni)
 		return;
 	}
 
-	map<int, Uniform *>::iterator i=data.find(index);
+	map<int, Uniform *>::iterator i = data.find(index);
 	if(i!=data.end())
 	{
 		delete i->second;
-		i->second=uni;
+		i->second = uni;
 	}
 	else
-		data[index]=uni;
+		data[index] = uni;
 }
 
 void ProgramData::uniform(int index, int v)
@@ -92,7 +99,7 @@ void ProgramData::apply() const
 
 
 ProgramData::Loader::Loader(ProgramData &pd, Program &pr):
-	pdata(pd),
+	DataFile::ObjectLoader<ProgramData>(pd),
 	prog(pr)
 {
 	add("uniform1i", &Loader::uniform1i);
@@ -104,27 +111,27 @@ ProgramData::Loader::Loader(ProgramData &pd, Program &pr):
 
 void ProgramData::Loader::uniform1i(const string &n, int v)
 {
-	pdata.uniform(prog.get_uniform_location(n), v);
+	obj.uniform(prog.get_uniform_location(n), v);
 }
 
 void ProgramData::Loader::uniform1f(const string &n, float v)
 {
-	pdata.uniform(prog.get_uniform_location(n), v);
+	obj.uniform(prog.get_uniform_location(n), v);
 }
 
 void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
 {
-	pdata.uniform(prog.get_uniform_location(n), v0, v1);
+	obj.uniform(prog.get_uniform_location(n), v0, v1);
 }
 
 void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
 {
-	pdata.uniform(prog.get_uniform_location(n), v0, v1, v2);
+	obj.uniform(prog.get_uniform_location(n), v0, v1, v2);
 }
 
 void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
 {
-	pdata.uniform(prog.get_uniform_location(n), v0, v1, v2, v3);
+	obj.uniform(prog.get_uniform_location(n), v0, v1, v2, v3);
 }
 
 } // namespace GL