X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiformblock.h;h=1a277106040f3757dd6d3c143f61f55137a08266;hb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;hp=fbc9c7047b3fdd57acb162338c9369dbdb442cf0;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2;p=libs%2Fgl.git

diff --git a/source/uniformblock.h b/source/uniformblock.h
index fbc9c704..1a277106 100644
--- a/source/uniformblock.h
+++ b/source/uniformblock.h
@@ -16,6 +16,10 @@ class Uniform;
 class Vector3;
 class Vector4;
 
+/**
+Stores uniforms with a specific layout.  Both named and default uniform blocks
+are supported.
+*/
 class UniformBlock: public Bufferable
 {
 private:
@@ -29,10 +33,13 @@ private:
 public:
 	UniformBlock();
 	UniformBlock(unsigned);
+	~UniformBlock();
 
 private:
-	virtual const void *get_data() const { return &data[0]; }
 	virtual unsigned get_data_size() const { return size; }
+	virtual unsigned get_alignment() const;
+	virtual void offset_changed();
+	virtual void upload_data() const;
 
 public:
 	void attach(int, const Uniform &);