X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Funiformblock.h;h=5e88f0f80de81919ebcc510defaccc6f778e7b47;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=ec42089a8823bb46ea75f8e94467b766f2d40459;hpb=acaefb4c669f01855252818ef0a2958cbdababc3;p=libs%2Fgl.git

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index ec42089a..5e88f0f8 100644
--- a/source/core/uniformblock.h
+++ b/source/core/uniformblock.h
@@ -5,6 +5,7 @@
 #include <msp/core/noncopyable.h>
 #include "bufferable.h"
 #include "reflectdata.h"
+#include "uniformblock_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -13,7 +14,7 @@ namespace GL {
 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;
@@ -21,13 +22,13 @@ private:
 public:
 	UniformBlock(const ReflectData::UniformBlockInfo &);
 
-	virtual unsigned get_data_size() const { return data.size(); }
+	virtual std::size_t get_data_size() const { return data.size(); }
 	virtual const void *get_data_pointer() const { return &data[0]; }
 private:
-	virtual unsigned get_alignment() const;
+	virtual std::size_t get_alignment() const;
 
 public:
-	void store(const ReflectData::UniformInfo &, unsigned, const void *);
+	void store(const ReflectData::UniformInfo &, std::size_t, const void *);
 };
 
 } // namespace GL