Split reflection data from Program to a separate struct

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

diff --git a/source/core/uniformblock.h b/source/core/uniformblock.h
index 18b651c7b4e498c12f2bdccba4c190dbe5c30663..08eaa9b857e3dcbc1c8de08e7a129433dbc6b0ee 100644 (file)
--- a/source/core/uniformblock.h
+++ b/source/core/uniformblock.h
@@ -3,8 +3,9 @@
 
 #include <map>
 #include <vector>
+#include <msp/core/noncopyable.h>
 #include "bufferable.h"
-#include "program.h"
+#include "reflectdata.h"
 #include "vector.h"
 
 namespace Msp {
@@ -26,7 +27,7 @@ protected:
 public:
        virtual ~UniformBlock() { }
 
-       virtual void attach(const Program::UniformInfo &, const Uniform &) = 0;
+       virtual void attach(const ReflectData::UniformInfo &, const Uniform &) = 0;
 };
 
 /** Stores uniforms for the default uniform block.  Uniforms are associated
@@ -39,7 +40,7 @@ private:
 public:
        DefaultUniformBlock();
 
-       virtual void attach(const Program::UniformInfo &, const Uniform &);
+       virtual void attach(const ReflectData::UniformInfo &, const Uniform &);
        void attach(int, const Uniform &);
        void apply() const;
 };
@@ -62,7 +63,7 @@ private:
        virtual unsigned get_alignment() const;
 
 public:
-       void attach(const Program::UniformInfo &, const Uniform &);
+       void attach(const ReflectData::UniformInfo &, const Uniform &);
 };
 
 } // namespace GL