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

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index bc0b933b..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,55 +20,21 @@ struct Color;
 Stores uniforms with a specific layout.  Both named and default uniform blocks
 are supported.
 */
-class UniformBlock: public NonCopyable
-{
-protected:
-	UniformBlock() { }
-public:
-	virtual ~UniformBlock() { }
-
-	virtual void attach(const Program::UniformInfo &, const Uniform &) = 0;
-	virtual void apply(int) const = 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 Program::UniformInfo &, const Uniform &);
-	void attach(int, const Uniform &);
-	virtual void apply(int) 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
+class UniformBlock: public NonCopyable, public Bufferable
 {
 private:
-	unsigned size;
 	std::vector<char> data;
-	mutable BufferRange *buf_range;
 
 public:
-	BufferBackedUniformBlock(unsigned);
-	virtual ~BufferBackedUniformBlock();
+	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(const Program::UniformInfo &, const Uniform &);
-	virtual void apply(int) const;
+	void store(const ReflectData::UniformInfo &, unsigned, const void *);
 };
 
 } // namespace GL