X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fprogramdata.h;h=2eef750cf78f7d4ff821ee9c1354cb395d6b6933;hp=380f352a66376b6b168805bea5f6c46f4ee0cae5;hb=77a534371433054384d213922a2e8c55f8a69ad6;hpb=1b23728908f5ec9beb08b2b70737c3903745fddc

diff --git a/source/render/programdata.h b/source/render/programdata.h
index 380f352a..2eef750c 100644
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -1,14 +1,12 @@
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
-#include <map>
 #include <stdexcept>
 #include <msp/datafile/objectloader.h>
 #include "datatype.h"
 #include "matrix.h"
 #include "reflectdata.h"
 #include "tag.h"
-#include "uniform.h"
 #include "vector.h"
 
 namespace Msp {
@@ -22,7 +20,6 @@ public:
 };
 
 class Buffer;
-class BufferBackedUniformBlock;
 class PipelineState;
 class Program;
 class UniformBlock;
@@ -104,11 +101,10 @@ private:
 	struct TaggedUniform
 	{
 		Tag tag;
-		Uniform *value;
-
-		TaggedUniform();
-
-		void replace_value(Uniform *);
+		DataType type = VOID;
+		unsigned array_size = 0;
+		unsigned data_offset = 0;
+		unsigned data_size = 0;
 	};
 
 	struct SharedBlock
@@ -154,10 +150,11 @@ private:
 	// XXX All these mutables are a bit silly, but I'm out of better ideas
 	const Program *tied_program;
 	std::vector<TaggedUniform> uniforms;
+	std::vector<char> uniform_data;
 	unsigned generation;
 	mutable std::vector<SharedBlock> blocks;
 	mutable std::vector<ProgramBlock> programs;
-	mutable BufferBackedUniformBlock *last_buffer_block;
+	mutable UniformBlock *last_buffer_block;
 	mutable Buffer *buffer;
 	mutable Mask dirty;
 	std::string debug_name;
@@ -170,16 +167,10 @@ public:
 	~ProgramData();
 
 private:
-	void uniform(Tag, Uniform *);
-	template<typename T, typename V>
-	void uniform(Tag, V);
-	template<typename T, typename V>
-	void uniform_array(Tag, unsigned, V);
+	void uniform(Tag, DataType, unsigned, const void *);
 	bool validate_tag(Tag) const;
-	void add_uniform(Tag, Uniform *);
 	void mark_dirty(Mask);
 public:
-	void uniform(Tag, const Uniform &);
 	void uniform(Tag, int);
 	void uniform(Tag, float);
 	void uniform(Tag, int, int);
@@ -242,8 +233,7 @@ public:
 	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;
+	void copy_uniform(const ProgramData &, Tag);
 
 private:
 	int find_uniform_index(Tag) const;
@@ -260,19 +250,19 @@ public:
 
 template<typename T, unsigned N>
 void ProgramData::uniform(Tag tag, const LinAl::Vector<T, N> &v)
-{ uniform<UniformVector<T, N> >(tag, &v.x); }
+{ uniform(tag, TypeTraits<LinAl::Vector<T, N>>::type, 1, &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)); }
+{ uniform(tag, TypeTraits<LinAl::Matrix<T, R, C>>::type, 1, &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); }
+{ uniform(tag, TypeTraits<LinAl::Vector<T, N>>::type, 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)); }
+{ uniform(tag, TypeTraits<LinAl::Matrix<T, R, C>>::type, n, &v[0](0, 0)); }
 
 } // namespace GL
 } // namespace Msp