X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=0f752191d586e1c0b00eca480c5693c2e269a3cd;hb=5ae4b0008b25072b5716f0cb585133315625a661;hp=d74017b50ba237965f4aea15e9a8f295ca7e29f7;hpb=0070eec93efbf27bcc70720141d8730b059eb964;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index d74017b5..0f752191 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -3,20 +3,26 @@
 
 #include <map>
 #include <msp/datafile/objectloader.h>
+#include "program.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-class Color;
+class Buffer;
 class Matrix;
-class Program;
 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
 {
@@ -34,25 +40,60 @@ public:
 	};
 
 private:
-	struct Block
+	typedef unsigned Mask;
+
+	enum
+	{
+		MASK_BITS = sizeof(Mask)*8,
+		ALL_ONES = static_cast<Mask>(-1)
+	};
+
+	struct SharedBlock
+	{
+		Mask used;
+		Mask dirty;
+		UniformBlock *block;
+
+		SharedBlock();
+		SharedBlock(unsigned, UniformBlock *);
+	};
+
+	struct ProgramBlock
 	{
-		bool dirty;
+		int bind_point;
 		UniformBlock *block;
+		SharedBlock *shared;
+
+		ProgramBlock();
+		ProgramBlock(int, SharedBlock *);
+	};
+
+	struct ProgramUniforms
+	{
+		std::vector<ProgramBlock> blocks;
+		Mask used;
+		Mask dirty;
 
-		Block();
+		ProgramUniforms();
 	};
 
-	typedef std::map<std::string, Uniform *> UniformMap;
-	typedef std::map<unsigned, Block> BlockMap;
+	typedef std::map<std::string, unsigned> SlotMap;
+	typedef std::map<Program::LayoutHash, SharedBlock> BlockMap;
+	typedef std::map<Program::LayoutHash, ProgramUniforms> ProgramMap;
 
-	UniformMap uniforms;
+	// XXX All these mutables are a bit silly, but I'm out of better ideas
+	SlotMap uniform_slots;
+	std::vector<Uniform *> uniforms;
 	mutable BlockMap blocks;
-	mutable bool modified;
+	mutable ProgramMap programs;
+	mutable UniformBlock *last_block;
+	mutable Buffer *buffer;
+	mutable unsigned dirty;
 
-	ProgramData &operator=(const ProgramData &);
 public:
 	ProgramData();
 	ProgramData(const ProgramData &);
+	ProgramData &operator=(const ProgramData &);
 	~ProgramData();
 
 private:
@@ -69,16 +110,24 @@ 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 *);
 	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;
+private:
+	unsigned compute_slot_mask(const Program::UniformBlockInfo &) const;
+	void update_block(UniformBlock &, const Program::UniformBlockInfo &) const;
+	SharedBlock *get_shared_block(const Program::UniformBlockInfo &) const;
 
+public:
+	/** Applies uniform blocks for the currently bound program, creating them
+	if needed. */
 	void apply() const;
 };