X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=6d0ebf8ad50c53d7526396c1a865a97935a812f2;hb=9846a5c6e73b3a146084894a11550dbbf184a22a;hp=51ecc579a2582fcfedbcc72e86cb04961e909194;hpb=97015ec7bddd26aa746f5227e4109b7d32438cca;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 51ecc579..6d0ebf8a 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
@@ -14,8 +7,13 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class Color;
+class Matrix;
 class Program;
 class Uniform;
+class UniformBlock;
+class Vector3;
+class Vector4;
 
 /**
 Stores uniform variables for a shader program.
@@ -25,11 +23,8 @@ class ProgramData
 public:
 	class Loader: public DataFile::ObjectLoader<ProgramData>
 	{
-	private:
-		Program &prog;
-
 	public:
-		Loader(ProgramData &, Program &);
+		Loader(ProgramData &);
 	private:
 		void uniform1i(const std::string &, int);
 		void uniform1f(const std::string &, float);
@@ -39,7 +34,20 @@ public:
 	};
 
 private:
-	std::map<int, Uniform *> data;
+	struct Block
+	{
+		bool dirty;
+		UniformBlock *block;
+
+		Block();
+	};
+
+	typedef std::map<std::string, Uniform *> UniformMap;
+	typedef std::map<unsigned, Block> BlockMap;
+
+	UniformMap uniforms;
+	mutable BlockMap blocks;
+	mutable bool modified;
 
 	ProgramData &operator=(const ProgramData &);
 public:
@@ -47,16 +55,25 @@ public:
 	ProgramData(const ProgramData &);
 	~ProgramData();
 
-	void uniform(int, Uniform *);
-	void uniform(int, int);
-	void uniform(int, float);
-	void uniform(int, float, float);
-	void uniform2(int, const float *);
-	void uniform(int, float, float, float);
-	void uniform3(int, const float *);
-	void uniform(int, float, float, float, float);
-	void uniform4(int, const float *);
-	void uniform_matrix4(int, const float *);
+private:
+	void uniform(const std::string &, Uniform *);
+public:
+	void uniform(const std::string &, int);
+	void uniform(const std::string &, float);
+	void uniform(const std::string &, float, float);
+	void uniform2(const std::string &, const float *);
+	void uniform(const std::string &, float, float, float);
+	void uniform(const std::string &, const Vector3 &);
+	void uniform3(const std::string &, const float *);
+	void uniform(const std::string &, float, float, float, float);
+	void uniform(const std::string &, const Vector4 &);
+	void uniform(const std::string &, const Color &);
+	void uniform4(const std::string &, const float *);
+	void uniform_matrix4(const std::string &, const float *);
+	void uniform_matrix4(const std::string &, const Matrix &);
+
+	const UniformBlock &get_block(const Program &) const;
+
 	void apply() const;
 };