X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=d74017b50ba237965f4aea15e9a8f295ca7e29f7;hb=0070eec93efbf27bcc70720141d8730b059eb964;hp=4cc2398ec9bafafeffd4fa202f2f64baa4801d6c;hpb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 4cc2398e..d74017b5 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
@@ -18,6 +11,7 @@ class Color;
 class Matrix;
 class Program;
 class Uniform;
+class UniformBlock;
 class Vector3;
 class Vector4;
 
@@ -40,32 +34,30 @@ public:
 	};
 
 private:
-	const Program &program;
-	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:
-	explicit ProgramData(const Program &);
+	ProgramData();
 	ProgramData(const ProgramData &);
 	~ProgramData();
 
 private:
-	void uniform(int, Uniform *);
+	void uniform(const std::string &, Uniform *);
 public:
-	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 uniform(int, const Vector3 &);
-	void uniform3(int, const float *);
-	void uniform(int, float, float, float, float);
-	void uniform(int, const Vector4 &);
-	void uniform(int, const Color &);
-	void uniform4(int, const float *);
-	void uniform_matrix4(int, const float *);
-	void uniform_matrix4(int, const Matrix &);
-
 	void uniform(const std::string &, int);
 	void uniform(const std::string &, float);
 	void uniform(const std::string &, float, float);
@@ -79,6 +71,13 @@ public:
 	void uniform4(const std::string &, const float *);
 	void uniform_matrix4(const std::string &, const float *);
 	void uniform_matrix4(const std::string &, const Matrix &);
+	void uniform1_array(const std::string &, unsigned, const float *);
+	void uniform2_array(const std::string &, unsigned, const float *);
+	void uniform3_array(const std::string &, unsigned, const float *);
+	void uniform4_array(const std::string &, unsigned, const float *);
+	void uniform_matrix4_array(const std::string &, unsigned, const float *);
+
+	const UniformBlock &get_block(const Program &) const;
 
 	void apply() const;
 };