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

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index c8b8d36a..08eaa9b8 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,50 @@ struct Color;
 Stores uniforms with a specific layout.  Both named and default uniform blocks
 are supported.
 */
-class UniformBlock: public Bufferable
+class UniformBlock: public NonCopyable
+{
+protected:
+	UniformBlock() { }
+public:
+	virtual ~UniformBlock() { }
+
+	virtual void attach(const ReflectData::UniformInfo &, const Uniform &) = 0;
+};
+
+/** Stores uniforms for the default uniform block.  Uniforms are associated
+with locations, as returned by Program::get_uniform_location. */
+class DefaultUniformBlock: public UniformBlock
+{
+private:
+	std::vector<const Uniform *> uniforms;
+
+public:
+	DefaultUniformBlock();
+
+	virtual void attach(const ReflectData::UniformInfo &, const Uniform &);
+	void attach(int, const Uniform &);
+	void apply() const;
+};
+
+/** Stores uniforms for a buffer-backed uniform block.  Uniform values are
+stored in a memory block which can be uploaded into a buffer and bound for use
+by a Program. */
+class BufferBackedUniformBlock: public UniformBlock, 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();
+	BufferBackedUniformBlock(unsigned);
 
-private:
 	virtual unsigned get_data_size() const { return size; }
+private:
 	virtual const void *get_data_pointer() const { return &data[0]; }
 	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 attach(const ReflectData::UniformInfo &, const Uniform &);
 };
 
 } // namespace GL