Use the right property when collecting materials for a material map

[libs/gl.git] / source / uniformblock.h

diff --git a/source/uniformblock.h b/source/uniformblock.h
index d694e3674a48e07f56e4abfdd512d149f8c2e547..c8b8d36a3d8e2deceaf8881d5dbb83ec0ae1f825 100644 (file)
--- 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,9 @@ 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 location_changed(Buffer *, unsigned, unsigned) const;
 
 public:
        void attach(int, const Uniform &);