X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=9acb93bc4d8701361458e4c20956d88b3e36bb21;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=af2679a5965bbd932082b679ffe88f135ff47434;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index af2679a5..9acb93bc 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -17,7 +17,7 @@ namespace GL {
 
 ProgramData::ProgramData()
 {
-	require_extension("GL_ARB_shader_objects");
+	static RequireExtension _ext("GL_ARB_shader_objects");
 }
 
 ProgramData::~ProgramData()
@@ -29,7 +29,10 @@ ProgramData::~ProgramData()
 void ProgramData::uniform(int index, Uniform *uni)
 {
 	if(index<0)
+	{
+		delete uni;
 		return;
+	}
 
 	map<int, Uniform *>::iterator i=data.find(index);
 	if(i!=data.end())
@@ -89,33 +92,39 @@ void ProgramData::apply() const
 
 
 ProgramData::Loader::Loader(ProgramData &pd, Program &pr):
-	pdata(pd),
+	DataFile::ObjectLoader<ProgramData>(pd),
 	prog(pr)
 {
-	add("uniform1", &Loader::uniform1);
-	add("uniform2", &Loader::uniform2);
-	add("uniform3", &Loader::uniform3);
-	add("uniform4", &Loader::uniform4);
+	add("uniform1i", &Loader::uniform1i);
+	add("uniform1f", &Loader::uniform1f);
+	add("uniform2f", &Loader::uniform2f);
+	add("uniform3f", &Loader::uniform3f);
+	add("uniform4f", &Loader::uniform4f);
+}
+
+void ProgramData::Loader::uniform1i(const string &n, int v)
+{
+	obj.uniform(prog.get_uniform_location(n), v);
 }
 
-void ProgramData::Loader::uniform1(const string &n, float 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::uniform2(const string &n, float v0, float v1)
+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::uniform3(const string &n, float v0, float v1, float v2)
+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::uniform4(const string &n, float v0, float v1, float v2, float v3)
+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