X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=4d80bb775afc92f20c05714c998399909a2299a7;hb=719578516a4d44a6f39eac3b074ce9f6180b5d53;hp=d74017b50ba237965f4aea15e9a8f295ca7e29f7;hpb=0070eec93efbf27bcc70720141d8730b059eb964;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index d74017b5..4d80bb77 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -3,13 +3,14 @@
 
 #include <map>
 #include <msp/datafile/objectloader.h>
+#include "program.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
 class Color;
 class Matrix;
-class Program;
 class Uniform;
 class UniformBlock;
 class Vector3;
@@ -45,8 +46,11 @@ private:
 	typedef std::map<std::string, Uniform *> UniformMap;
 	typedef std::map<unsigned, Block> BlockMap;
 
+	// XXX All these mutables are a bit silly, but I'm out of better ideas
 	UniformMap uniforms;
 	mutable BlockMap blocks;
+	mutable UniformBlock *last_block;
+	mutable Buffer *buffer;
 	mutable bool modified;
 
 	ProgramData &operator=(const ProgramData &);
@@ -77,7 +81,10 @@ public:
 	void uniform4_array(const std::string &, unsigned, const float *);
 	void uniform_matrix4_array(const std::string &, unsigned, const float *);
 
-	const UniformBlock &get_block(const Program &) const;
+private:
+	const UniformBlock &get_block(const Program &, const Program::UniformBlockInfo *) const;
+public:
+	const UniformBlock &get_block(const Program &, const std::string &) const;
 
 	void apply() const;
 };