X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fprogramdata.h;h=1bcd3aab42c6ea2158f5beb0fbdcaab8f200720e;hp=e96a73acc651ba8ec9a1ab2b3af1cf77f337c4bc;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/render/programdata.h b/source/render/programdata.h
index e96a73ac..1bcd3aab 100644
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -7,6 +7,8 @@
 #include "datatype.h"
 #include "matrix.h"
 #include "program.h"
+#include "tag.h"
+#include "uniform.h"
 #include "vector.h"
 
 namespace Msp {
@@ -20,7 +22,8 @@ public:
 };
 
 class Buffer;
-class Uniform;
+class BufferBackedUniformBlock;
+class PipelineState;
 class UniformBlock;
 struct Color;
 
@@ -97,68 +100,66 @@ private:
 		ALL_ONES = static_cast<Mask>(-1)
 	};
 
-	struct NamedUniform
+	struct TaggedUniform
 	{
-		std::string name;
+		Tag tag;
 		Uniform *value;
 
-		NamedUniform();
+		TaggedUniform();
 
-		bool compare_name(const std::string &, unsigned) const;
 		void replace_value(Uniform *);
 	};
 
 	struct SharedBlock
 	{
+		Program::LayoutHash block_hash;
 		Mask used;
 		Mask dirty;
 		UniformBlock *block;
 		union
 		{
-			UInt8 type_flag;
-			UInt8 values[16];
+			std::uint8_t type_flag;
+			std::uint8_t values[16];
 			struct
 			{
-				UInt8 type_flag;
-				UInt8 *values;
+				std::uint8_t type_flag;
+				std::uint8_t *values;
 			} dynamic;
 		} indices;
 
-		SharedBlock(UniformBlock *);
+		SharedBlock(Program::LayoutHash);
 
-		const UInt8 *get_uniform_indices() const;
+		const std::uint8_t *get_uniform_indices() const;
 	};
 
 	struct ProgramBlock
 	{
+		Program::LayoutHash prog_hash;
 		int bind_point;
-		UniformBlock *block;
-		SharedBlock *shared;
-
-		ProgramBlock();
-		ProgramBlock(int, SharedBlock *);
-	};
-
-	struct ProgramUniforms
-	{
-		std::vector<ProgramBlock> blocks;
-		Mask used;
-		Mask dirty;
+		int block_index;
+		union
+		{
+			UniformBlock *block;
+			struct
+			{
+				Mask used;
+				Mask dirty;
+			} masks;
+		};
 
-		ProgramUniforms();
+		ProgramBlock(Program::LayoutHash);
 	};
 
-	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
 	const Program *tied_program;
-	std::vector<NamedUniform> uniforms;
-	mutable BlockMap blocks;
-	mutable ProgramMap programs;
-	mutable UniformBlock *last_block;
+	std::vector<TaggedUniform> uniforms;
+	unsigned generation;
+	mutable std::vector<SharedBlock> blocks;
+	mutable std::vector<ProgramBlock> programs;
+	mutable BufferBackedUniformBlock *last_buffer_block;
 	mutable Buffer *buffer;
-	mutable unsigned dirty;
+	mutable Mask dirty;
+	std::string debug_name;
 
 public:
 	ProgramData(const Program * = 0);
@@ -168,86 +169,110 @@ public:
 	~ProgramData();
 
 private:
-	void uniform(const std::string &, Uniform *);
+	void uniform(Tag, Uniform *);
 	template<typename T, typename V>
-	void uniform(const std::string &, V);
+	void uniform(Tag, V);
 	template<typename T, typename V>
-	void uniform_array(const std::string &, unsigned, V);
-	bool validate_name(const std::string &) const;
-	void add_uniform(const std::string &, Uniform *);
+	void uniform_array(Tag, unsigned, V);
+	bool validate_tag(Tag) const;
+	void add_uniform(Tag, Uniform *);
+	void mark_dirty(Mask);
 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);
-	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 *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 2, 3> &);
-	void uniform_matrix3x2(const std::string &, const float *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 2, 4> &);
-	void uniform_matrix4x2(const std::string &, const float *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 3, 2> &);
-	void uniform_matrix2x3(const std::string &, const float *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 3, 3> &);
-	void uniform_matrix3(const std::string &, const float *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 3, 4> &);
-	void uniform_matrix4x3(const std::string &, const float *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 4, 2> &);
-	void uniform_matrix2x4(const std::string &, const float *);
-	void uniform(const std::string &, const LinAl::Matrix<float, 4, 3> &);
-	void uniform_matrix3x4(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_matrix2_array(const std::string &, unsigned, const float *);
-	void uniform_matrix3x2_array(const std::string &, unsigned, const float *);
-	void uniform_matrix4x2_array(const std::string &, unsigned, const float *);
-	void uniform_matrix2x3_array(const std::string &, unsigned, const float *);
-	void uniform_matrix3_array(const std::string &, unsigned, const float *);
-	void uniform_matrix4x3_array(const std::string &, unsigned, const float *);
-	void uniform_matrix2x4_array(const std::string &, unsigned, const float *);
-	void uniform_matrix3x4_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;
-	const Uniform *find_uniform(const std::string &) const;
+	void uniform(Tag, const Uniform &);
+	void uniform(Tag, int);
+	void uniform(Tag, float);
+	void uniform(Tag, int, int);
+	void uniform(Tag, float, float);
+	void uniform2(Tag, const int *);
+	void uniform2(Tag, const float *);
+	void uniform(Tag, int, int, int);
+	void uniform(Tag, float, float, float);
+	void uniform3(Tag, const int *);
+	void uniform3(Tag, const float *);
+	void uniform(Tag, int, int, int, int);
+	void uniform(Tag, float, float, float, float);
+	void uniform(Tag, const Color &);
+	void uniform4(Tag, const int *);
+	void uniform4(Tag, const float *);
+	void uniform_matrix2(Tag, const float *);
+	void uniform_matrix3x2(Tag, const float *);
+	void uniform_matrix4x2(Tag, const float *);
+	void uniform_matrix2x3(Tag, const float *);
+	void uniform_matrix3(Tag, const float *);
+	void uniform_matrix4x3(Tag, const float *);
+	void uniform_matrix2x4(Tag, const float *);
+	void uniform_matrix3x4(Tag, const float *);
+	void uniform(Tag, const Matrix &);
+	void uniform_matrix4(Tag, const float *);
+	void uniform_array(Tag, unsigned, const int *);
+	void uniform_array(Tag, unsigned, const float *);
+	void uniform1_array(Tag, unsigned, const int *);
+	void uniform1_array(Tag, unsigned, const float *);
+	void uniform2_array(Tag, unsigned, const int *);
+	void uniform2_array(Tag, unsigned, const float *);
+	void uniform3_array(Tag, unsigned, const int *);
+	void uniform3_array(Tag, unsigned, const float *);
+	void uniform4_array(Tag, unsigned, const int *);
+	void uniform4_array(Tag, unsigned, const float *);
+	void uniform_matrix2_array(Tag, unsigned, const float *);
+	void uniform_matrix3x2_array(Tag, unsigned, const float *);
+	void uniform_matrix4x2_array(Tag, unsigned, const float *);
+	void uniform_matrix2x3_array(Tag, unsigned, const float *);
+	void uniform_matrix3_array(Tag, unsigned, const float *);
+	void uniform_matrix4x3_array(Tag, unsigned, const float *);
+	void uniform_matrix2x4_array(Tag, unsigned, const float *);
+	void uniform_matrix3x4_array(Tag, unsigned, const float *);
+	void uniform_matrix4_array(Tag, unsigned, const float *);
+
+	template<typename T, unsigned N>
+	void uniform(Tag, const LinAl::Vector<T, N> &);
+
+	template<typename T, unsigned R, unsigned C>
+	void uniform(Tag, const LinAl::Matrix<T, R, C> &);
+
+	template<typename T, unsigned N>
+	void uniform_array(Tag, unsigned, const LinAl::Vector<T, N> *);
+
+	template<typename T, unsigned R, unsigned C>
+	void uniform_array(Tag, unsigned, const LinAl::Matrix<T, R, C> *);
+
+	void remove_uniform(Tag);
+
+	unsigned get_generation() const { return generation; }
+
+	std::vector<Tag> get_uniform_tags() const;
+	const Uniform &get_uniform(Tag) const;
+	const Uniform *find_uniform(Tag) const;
 
 private:
-	static bool uniform_name_compare(const NamedUniform &, const std::string &);
-	int find_uniform_index(const std::string &) const;
+	int find_uniform_index(Tag) const;
+	std::vector<ProgramBlock>::iterator get_program(const Program &) 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;
 
+	std::vector<ProgramBlock>::const_iterator prepare_program(const Program &) const;
 public:
-	/** Applies uniform blocks for the currently bound program, creating them
-	if needed. */
-	void apply() const;
+	void apply(const Program &, PipelineState &) const;
+
+	void set_debug_name(const std::string &);
 };
 
+template<typename T, unsigned N>
+void ProgramData::uniform(Tag tag, const LinAl::Vector<T, N> &v)
+{ uniform<UniformVector<T, N> >(tag, &v.x); }
+
+template<typename T, unsigned R, unsigned C>
+void ProgramData::uniform(Tag tag, const LinAl::Matrix<T, R, C> &v)
+{ uniform<UniformMatrix<T, R, C> >(tag, &v(0, 0)); }
+
+template<typename T, unsigned N>
+void ProgramData::uniform_array(Tag tag, unsigned n, const LinAl::Vector<T, N> *v)
+{ uniform_array<UniformVector<T, N> >(tag, n, &v[0].x); }
+
+template<typename T, unsigned R, unsigned C>
+void ProgramData::uniform_array(Tag tag, unsigned n, const LinAl::Matrix<T, R, C> *v)
+{ uniform_array<UniformMatrix<T, R, C> >(tag, n, &v[0](0, 0)); }
+
 } // namespace GL
 } // namespace Msp