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

diff --git a/source/uniformblock.h b/source/uniformblock.h
index d694e367..02e9086e 100644
--- a/source/uniformblock.h
+++ b/source/uniformblock.h
@@ -11,9 +11,9 @@ namespace Msp {
 namespace GL {
 
 class BufferRange;
-class Color;
 class Matrix;
 class Uniform;
+struct Color;
 
 /**
 Stores uniforms with a specific layout.  Both named and default uniform blocks
@@ -36,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 &);