Allocate textures attached to framebuffers automatically

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

diff --git a/source/programdata.h b/source/programdata.h
index 4d7938bf1dc7850bd4021f81cf21bdf4df19d1ac..51ecc579a2582fcfedbcc72e86cb04961e909194 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -9,7 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_PROGRAMDATA_H_
 
 #include <map>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GL {
@@ -23,10 +23,9 @@ Stores uniform variables for a shader program.
 class ProgramData
 {
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::ObjectLoader<ProgramData>
        {
        private:
-               ProgramData &pdata;
                Program &prog;
 
        public:
@@ -42,10 +41,10 @@ public:
 private:
        std::map<int, Uniform *> data;
 
-       ProgramData(const ProgramData &);
        ProgramData &operator=(const ProgramData &);
 public:
        ProgramData();
+       ProgramData(const ProgramData &);
        ~ProgramData();
 
        void uniform(int, Uniform *);