X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=08b117b4fbc2712842bfd2967f23201a29b18bcc;hb=8dd40d3723cb2309ffcca5e041898a767cd7cdea;hp=78f7292647a97436fed9e4b28ed0bfa17280f4f0;hpb=653b618e65b291a344abb1ee9d08dc5d1fde1094;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 78f72926..08b117b4 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -89,14 +89,36 @@ private:
 		ALL_ONES = static_cast<Mask>(-1)
 	};
 
+	struct NamedUniform
+	{
+		std::string name;
+		Uniform *value;
+
+		NamedUniform();
+
+		bool compare_name(const std::string &, unsigned) const;
+		void replace_value(Uniform *);
+	};
+
 	struct SharedBlock
 	{
 		Mask used;
 		Mask dirty;
 		UniformBlock *block;
-
-		SharedBlock();
-		SharedBlock(unsigned, UniformBlock *);
+		union
+		{
+			UInt8 type_flag;
+			UInt8 values[16];
+			struct
+			{
+				UInt8 type_flag;
+				UInt8 *values;
+			} dynamic;
+		} indices;
+
+		SharedBlock(UniformBlock *);
+
+		const UInt8 *get_uniform_indices() const;
 	};
 
 	struct ProgramBlock
@@ -118,13 +140,12 @@ private:
 		ProgramUniforms();
 	};
 
-	typedef std::map<std::string, unsigned> SlotMap;
 	typedef std::map<Program::LayoutHash, SharedBlock> BlockMap;
 	typedef std::map<Program::LayoutHash, ProgramUniforms> ProgramMap;
 
 	// XXX All these mutables are a bit silly, but I'm out of better ideas
-	SlotMap uniform_slots;
-	std::vector<Uniform *> uniforms;
+	const Program *tied_program;
+	std::vector<NamedUniform> uniforms;
 	mutable BlockMap blocks;
 	mutable ProgramMap programs;
 	mutable UniformBlock *last_block;
@@ -132,7 +153,7 @@ private:
 	mutable unsigned dirty;
 
 public:
-	ProgramData();
+	ProgramData(const Program * = 0);
 	ProgramData(const ProgramData &);
 	ProgramData &operator=(const ProgramData &);
 	~ProgramData();
@@ -140,6 +161,7 @@ public:
 private:
 	void uniform(const std::string &, Uniform *);
 public:
+	void uniform(const std::string &, const Uniform &);
 	void uniform(const std::string &, int);
 	void uniform(const std::string &, float);
 	void uniform(const std::string &, int, int);
@@ -171,12 +193,19 @@ public:
 	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_matrix2_array(const std::string &, unsigned, const float *);
+	void uniform_matrix3_array(const std::string &, unsigned, const float *);
 	void uniform_matrix4_array(const std::string &, unsigned, const float *);
 	void remove_uniform(const std::string &);
 
+	std::vector<std::string> get_uniform_names() const;
+	const Uniform &get_uniform(const std::string &) const;
+
 private:
-	unsigned compute_slot_mask(const Program::UniformBlockInfo &) const;
-	void update_block(UniformBlock &, const Program::UniformBlockInfo &) const;
+	static bool uniform_name_compare(const NamedUniform &, const std::string &);
+	int find_uniform_index(const std::string &) const;
+	void update_block_uniform_indices(SharedBlock &, const Program::UniformBlockInfo &) const;
+	void update_block(SharedBlock &, const Program::UniformBlockInfo &) const;
 	SharedBlock *get_shared_block(const Program::UniformBlockInfo &) const;
 
 public: