X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=e045c6fd10def72e59adfc92dc4586373a915361;hb=3b159edbe4e80a2bc19c4c2fcd42cb996b9fbfe0;hp=196abcb1ebe30cf151b855aa27257658fd3c02e1;hpb=d147aa8f56e6a60d80f628ffeedf16bc99b588d3;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 196abcb1..e045c6fd 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <msp/datafile/objectloader.h>
+#include "datatype.h"
 #include "matrix.h"
 #include "program.h"
 #include "vector.h"
@@ -34,12 +35,52 @@ public:
 	private:
 		void uniform1i(const std::string &, int);
 		void uniform1f(const std::string &, float);
+		void uniform2i(const std::string &, int, int);
 		void uniform2f(const std::string &, float, float);
+		void uniform3i(const std::string &, int, int, int);
 		void uniform3f(const std::string &, float, float, float);
+		void uniform4i(const std::string &, int, int, int, int);
 		void uniform4f(const std::string &, float, float, float, float);
+		void uniform_array_(const std::string &, DataType, unsigned);
+		void uniform1i_array(const std::string &);
+		void uniform1f_array(const std::string &);
+		void uniform2i_array(const std::string &);
+		void uniform2f_array(const std::string &);
+		void uniform3i_array(const std::string &);
+		void uniform3f_array(const std::string &);
+		void uniform4i_array(const std::string &);
+		void uniform4f_array(const std::string &);
+		void uniform_array(const std::string &);
 	};
 
 private:
+	class ArrayLoader: public DataFile::Loader
+	{
+	private:
+		DataType type;
+		unsigned element_size;
+		std::vector<char> data;
+
+	public:
+		ArrayLoader(DataType, unsigned);
+
+		DataType get_data_type() const { return type; }
+		unsigned get_element_size() const { return element_size; }
+		const void *get_data() const { return &data[0]; }
+		unsigned get_size() const { return data.size()/(4*element_size); }
+
+	private:
+		void uniform(DataType, unsigned, const void *);
+		void uniform1i(int);
+		void uniform1f(float);
+		void uniform2i(int, int);
+		void uniform2f(float, float);
+		void uniform3i(int, int, int);
+		void uniform3f(float, float, float);
+		void uniform4i(int, int, int, int);
+		void uniform4f(float, float, float, float);
+	};
+
 	typedef unsigned Mask;
 
 	enum
@@ -101,14 +142,20 @@ private:
 public:
 	void uniform(const std::string &, int);
 	void uniform(const std::string &, float);
+	void uniform(const std::string &, int, int);
 	void uniform(const std::string &, float, float);
+	void uniform2(const std::string &, const int *);
 	void uniform2(const std::string &, const float *);
+	void uniform(const std::string &, int, int, int);
 	void uniform(const std::string &, float, float, float);
 	void uniform(const std::string &, const Vector3 &);
+	void uniform3(const std::string &, const int *);
 	void uniform3(const std::string &, const float *);
+	void uniform(const std::string &, int, int, int, int);
 	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 int *);
 	void uniform4(const std::string &, const float *);
 	void uniform(const std::string &, const LinAl::Matrix<float, 2, 2> &);
 	void uniform_matrix2(const std::string &, const float *);
@@ -116,9 +163,13 @@ public:
 	void uniform_matrix3(const std::string &, const float *);
 	void uniform(const std::string &, const Matrix &);
 	void uniform_matrix4(const std::string &, const float *);
+	void uniform1_array(const std::string &, unsigned, const int *);
 	void uniform1_array(const std::string &, unsigned, const float *);
+	void uniform2_array(const std::string &, unsigned, const int *);
 	void uniform2_array(const std::string &, unsigned, const float *);
+	void uniform3_array(const std::string &, unsigned, const int *);
 	void uniform3_array(const std::string &, unsigned, const float *);
+	void uniform4_array(const std::string &, unsigned, const int *);
 	void uniform4_array(const std::string &, unsigned, const float *);
 	void uniform_matrix4_array(const std::string &, unsigned, const float *);