X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Funiformblock.h;h=de8b90e4bc5d2d86fd1ebc3749ec59f7ff108066;hb=b8b7c6b251cace40021bdfacc6aa17242aa51e1d;hp=9f2a0849e9cca10795c759456dc12fcf6405a386;hpb=8366f8951984aa436938b1bb18a57067ff2260c1;p=libs%2Fgl.git

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index 9f2a0849..de8b90e4 100644
--- a/source/core/uniformblock.h
+++ b/source/core/uniformblock.h
@@ -1,26 +1,20 @@
 #ifndef MSP_GL_UNIFORMBLOCK_H_
 #define MSP_GL_UNIFORMBLOCK_H_
 
-#include <map>
 #include <vector>
 #include <msp/core/noncopyable.h>
 #include "bufferable.h"
 #include "reflectdata.h"
-#include "vector.h"
+#include "uniformblock_backend.h"
 
 namespace Msp {
 namespace GL {
 
-class BufferRange;
-class Matrix;
-class Uniform;
-struct Color;
-
 /**
 Stores uniforms with a specific layout.  Both named and default uniform blocks
 are supported.
 */
-class UniformBlock: public NonCopyable, public Bufferable
+class UniformBlock: public UniformBlockBackend, public NonCopyable, public Bufferable
 {
 private:
 	std::vector<char> data;
@@ -34,7 +28,7 @@ private:
 	virtual unsigned get_alignment() const;
 
 public:
-	void store(const ReflectData::UniformInfo &, const Uniform &);
+	void store(const ReflectData::UniformInfo &, unsigned, const void *);
 };
 
 } // namespace GL