X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=f51ad788884aa0ebbbbf545d4a7d8c8cda2da350;hb=ae9abd6be3e556d0a202cc5ab05668da715382c9;hp=4d80bb775afc92f20c05714c998399909a2299a7;hpb=8ff00c9663371684f69059a548f8a0addca10d5c;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 4d80bb77..f51ad788 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -4,20 +4,25 @@
 #include <map>
 #include <msp/datafile/objectloader.h>
 #include "program.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
 class Buffer;
-class Color;
 class Matrix;
 class Uniform;
 class UniformBlock;
-class Vector3;
-class Vector4;
+struct Color;
 
 /**
-Stores uniform variables for a shader program.
+Stores uniform variables for shader programs.  The uniforms are stored in a
+program-independent way, and UniformBlocks are created to match the uniform
+layouts of different programs.  If multiple programs have the same layout, the
+same block is used for them.
+
+The class is optimized for an access pattern where the set of uniforms and
+programs stays constants, with only the values changing.
 */
 class ProgramData
 {
@@ -35,10 +40,18 @@ public:
 	};
 
 private:
+	enum Changes
+	{
+		NO_CHANGES,
+		VALUES_CHANGED,
+		KEYS_CHANGED
+	};
+
 	struct Block
 	{
-		bool dirty;
+		Changes changes;
 		UniformBlock *block;
+		std::map<unsigned, const Uniform *const *> uniforms;
 
 		Block();
 	};
@@ -51,12 +64,12 @@ private:
 	mutable BlockMap blocks;
 	mutable UniformBlock *last_block;
 	mutable Buffer *buffer;
-	mutable bool modified;
+	mutable Changes changes;
 
-	ProgramData &operator=(const ProgramData &);
 public:
 	ProgramData();
 	ProgramData(const ProgramData &);
+	ProgramData &operator=(const ProgramData &);
 	~ProgramData();
 
 private:
@@ -73,8 +86,10 @@ public:
 	void uniform(const std::string &, const Vector4 &);
 	void uniform(const std::string &, const Color &);
 	void uniform4(const std::string &, const float *);
+	void uniform_matrix2(const std::string &, const float *);
+	void uniform_matrix3(const std::string &, const float *);
+	void uniform(const std::string &, const Matrix &);
 	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 *);
@@ -82,10 +97,17 @@ public:
 	void uniform_matrix4_array(const std::string &, unsigned, const float *);
 
 private:
-	const UniformBlock &get_block(const Program &, const Program::UniformBlockInfo *) const;
+	void find_uniforms_for_block(Block &, const Program::UniformBlockInfo &) const;
+	UniformBlock *create_block(const Program::UniformBlockInfo &) const;
+	const UniformBlock *get_block(const Program &, const Program::UniformBlockInfo *) const;
+
 public:
-	const UniformBlock &get_block(const Program &, const std::string &) const;
+	/** Returns a UniformBlock matching the program's layout.  If name is empty,
+	uniforms for the default uniform block (outside any uniform block
+	declarations) are returned. */
+	const UniformBlock *get_block(const Program &prog, const std::string &name) const;
 
+	/// Creates blocks for the currently bound program and applies them.
 	void apply() const;
 };