- typedef std::map<std::string, Uniform *> UniformMap;
- typedef std::map<unsigned, Block> BlockMap;
+ struct ProgramBlock
+ {
+ int bind_point;
+ UniformBlock *block;
+ SharedBlock *shared;
+
+ ProgramBlock();
+ ProgramBlock(int, SharedBlock *);
+ };
+
+ struct ProgramUniforms
+ {
+ std::vector<ProgramBlock> blocks;
+ Mask used;
+ Mask dirty;
+
+ ProgramUniforms();
+ };
+
+ typedef std::map<std::string, unsigned> SlotMap;
+ typedef std::map<Program::LayoutHash, SharedBlock> BlockMap;
+ typedef std::map<Program::LayoutHash, ProgramUniforms> ProgramMap;