X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Funiformblock.h;h=79e699fd5bbf37c36298596deefccebe3b931ecb;hb=729a477b47e97aea41f3f0b5db551f02bf70d1ee;hp=c8b8d36a3d8e2deceaf8881d5dbb83ec0ae1f825;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index c8b8d36a..79e699fd 100644
--- a/source/core/uniformblock.h
+++ b/source/core/uniformblock.h
@@ -3,8 +3,9 @@
 
 #include <map>
 #include <vector>
+#include <msp/core/noncopyable.h>
 #include "bufferable.h"
-#include "program.h"
+#include "reflectdata.h"
 #include "vector.h"
 
 namespace Msp {
@@ -19,32 +20,21 @@ struct Color;
 Stores uniforms with a specific layout.  Both named and default uniform blocks
 are supported.
 */
-class UniformBlock: public Bufferable
+class UniformBlock: public NonCopyable, public Bufferable
 {
 private:
-	std::map<int, const Uniform *> uniforms;
-	unsigned size;
 	std::vector<char> data;
-	mutable BufferRange *buf_range;
 
-	UniformBlock(const UniformBlock &);
-	UniformBlock &operator=(const UniformBlock &);
 public:
-	UniformBlock();
-	UniformBlock(unsigned);
-	~UniformBlock();
+	UniformBlock(const ReflectData::UniformBlockInfo &);
 
-private:
-	virtual unsigned get_data_size() const { return size; }
+	virtual unsigned get_data_size() const { return data.size(); }
 	virtual const void *get_data_pointer() const { return &data[0]; }
+private:
 	virtual unsigned get_alignment() const;
-	virtual void location_changed(Buffer *, unsigned, unsigned) const;
 
 public:
-	void attach(int, const Uniform &);
-	void attach(const Program::UniformInfo &, const Uniform &);
-
-	void apply(int) const;
+	void store(const ReflectData::UniformInfo &, unsigned, const void *);
 };
 
 } // namespace GL