Check the flat qualifier from the correct member

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

diff --git a/source/programdata.h b/source/programdata.h
deleted file mode 100644 (file)
index 6d0ebf8..0000000
--- a/source/programdata.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef MSP_GL_PROGRAMDATA_H_
-#define MSP_GL_PROGRAMDATA_H_
-
-#include <map>
-#include <msp/datafile/objectloader.h>
-
-namespace Msp {
-namespace GL {
-
-class Color;
-class Matrix;
-class Program;
-class Uniform;
-class UniformBlock;
-class Vector3;
-class Vector4;
-
-/**
-Stores uniform variables for a shader program.
-*/
-class ProgramData
-{
-public:
-       class Loader: public DataFile::ObjectLoader<ProgramData>
-       {
-       public:
-               Loader(ProgramData &);
-       private:
-               void uniform1i(const std::string &, int);
-               void uniform1f(const std::string &, float);
-               void uniform2f(const std::string &, float, float);
-               void uniform3f(const std::string &, float, float, float);
-               void uniform4f(const std::string &, float, float, float, float);
-       };
-
-private:
-       struct Block
-       {
-               bool dirty;
-               UniformBlock *block;
-
-               Block();
-       };
-
-       typedef std::map<std::string, Uniform *> UniformMap;
-       typedef std::map<unsigned, Block> BlockMap;
-
-       UniformMap uniforms;
-       mutable BlockMap blocks;
-       mutable bool modified;
-
-       ProgramData &operator=(const ProgramData &);
-public:
-       ProgramData();
-       ProgramData(const ProgramData &);
-       ~ProgramData();
-
-private:
-       void uniform(const std::string &, Uniform *);
-public:
-       void uniform(const std::string &, int);
-       void uniform(const std::string &, float);
-       void uniform(const std::string &, float, float);
-       void uniform2(const std::string &, const float *);
-       void uniform(const std::string &, float, float, float);
-       void uniform(const std::string &, const Vector3 &);
-       void uniform3(const std::string &, const float *);
-       void uniform(const std::string &, float, float, float, float);
-       void uniform(const std::string &, const Vector4 &);
-       void uniform(const std::string &, const Color &);
-       void uniform4(const std::string &, const float *);
-       void uniform_matrix4(const std::string &, const float *);
-       void uniform_matrix4(const std::string &, const Matrix &);
-
-       const UniformBlock &get_block(const Program &) const;
-
-       void apply() const;
-};
-
-} // namespace GL
-} // namespace Msp
-
-#endif