#include <map>
#include <msp/datafile/objectloader.h>
+#include "program.h"
namespace Msp {
namespace GL {
+class Buffer;
class Color;
class Matrix;
-class Program;
class Uniform;
+class UniformBlock;
class Vector3;
class Vector4;
};
private:
- const Program &program;
- std::map<int, Uniform *> data;
+ struct Block
+ {
+ bool dirty;
+ UniformBlock *block;
+
+ Block();
+ };
+
+ typedef std::map<std::string, Uniform *> UniformMap;
+ typedef std::map<unsigned, Block> BlockMap;
+
+ // XXX All these mutables are a bit silly, but I'm out of better ideas
+ UniformMap uniforms;
+ mutable BlockMap blocks;
+ mutable UniformBlock *last_block;
+ mutable Buffer *buffer;
+ mutable bool modified;
ProgramData &operator=(const ProgramData &);
public:
- explicit ProgramData(const Program &);
+ ProgramData();
ProgramData(const ProgramData &);
~ProgramData();
private:
- void uniform(int, Uniform *);
+ void uniform(const std::string &, Uniform *);
public:
- void uniform(int, int);
- void uniform(int, float);
- void uniform(int, float, float);
- void uniform2(int, const float *);
- void uniform(int, float, float, float);
- void uniform(int, const Vector3 &);
- void uniform3(int, const float *);
- void uniform(int, float, float, float, float);
- void uniform(int, const Vector4 &);
- void uniform(int, const Color &);
- void uniform4(int, const float *);
- void uniform_matrix4(int, const float *);
- void uniform_matrix4(int, const Matrix &);
-
void uniform(const std::string &, int);
void uniform(const std::string &, float);
void uniform(const std::string &, float, float);
void uniform4(const std::string &, const float *);
void uniform_matrix4(const std::string &, const float *);
void uniform_matrix4(const std::string &, const Matrix &);
+ void uniform1_array(const std::string &, unsigned, const float *);
+ void uniform2_array(const std::string &, unsigned, const float *);
+ void uniform3_array(const std::string &, unsigned, const float *);
+ void uniform4_array(const std::string &, unsigned, const float *);
+ void uniform_matrix4_array(const std::string &, unsigned, const float *);
+
+private:
+ const UniformBlock &get_block(const Program &, const Program::UniformBlockInfo *) const;
+public:
+ const UniformBlock &get_block(const Program &, const std::string &) const;
void apply() const;
};