X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Funiformblock.h;h=02e9086ef4ed75bdf118ca2fe41fd21ac4f74637;hp=12b24de3d06a810aa16040b49d2df973e53eba5d;hb=20af6dd2f04caa224d8cae00befc97d010a1ed08;hpb=c21d4de686e7abd51b0a779af00f06ce459e18d6

diff --git a/source/uniformblock.h b/source/uniformblock.h
index 12b24de3..02e9086e 100644
--- a/source/uniformblock.h
+++ b/source/uniformblock.h
@@ -5,17 +5,20 @@
 #include <vector>
 #include "bufferable.h"
 #include "program.h"
+#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
 class BufferRange;
-class Color;
 class Matrix;
 class Uniform;
-class Vector3;
-class Vector4;
+struct Color;
 
+/**
+Stores uniforms with a specific layout.  Both named and default uniform blocks
+are supported.
+*/
 class UniformBlock: public Bufferable
 {
 private:
@@ -33,9 +36,10 @@ public:
 
 private:
 	virtual unsigned get_data_size() const { return size; }
+	virtual const void *get_data_pointer() const { return &data[0]; }
 	virtual unsigned get_alignment() const;
 	virtual void offset_changed();
-	virtual void upload_data() const;
+	virtual void upload_data(char *) const;
 
 public:
 	void attach(int, const Uniform &);