namespace GL {
class Buffer;
-class Color;
class Matrix;
class Uniform;
class UniformBlock;
+struct Color;
/**
Stores uniform variables for shader programs. The uniforms are stored in a
};
private:
- enum Changes
+ typedef unsigned Mask;
+
+ enum
{
- NO_CHANGES,
- VALUES_CHANGED,
- KEYS_CHANGED
+ MASK_BITS = sizeof(Mask)*8,
+ ALL_ONES = static_cast<Mask>(-1)
};
- struct Block
+ struct SharedBlock
{
- Changes changes;
+ Mask used;
+ Mask dirty;
UniformBlock *block;
- std::map<unsigned, const Uniform *const *> uniforms;
- Block();
+ SharedBlock();
+ SharedBlock(unsigned, UniformBlock *);
};
- 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;
// XXX All these mutables are a bit silly, but I'm out of better ideas
- UniformMap uniforms;
+ SlotMap uniform_slots;
+ std::vector<Uniform *> uniforms;
mutable BlockMap blocks;
+ mutable ProgramMap programs;
mutable UniformBlock *last_block;
mutable Buffer *buffer;
- mutable Changes changes;
+ mutable unsigned dirty;
public:
ProgramData();
void uniform_matrix4_array(const std::string &, unsigned, const float *);
private:
- void find_uniforms_for_block(Block &, const Program::UniformBlockInfo &) const;
- UniformBlock *create_block(const Program::UniformBlockInfo &) const;
- const UniformBlock *get_block(const Program &, const Program::UniformBlockInfo *) const;
+ unsigned compute_slot_mask(const Program::UniformBlockInfo &) const;
+ void update_block(UniformBlock &, const Program::UniformBlockInfo &) const;
+ SharedBlock *get_shared_block(const Program::UniformBlockInfo &) const;
public:
- /** Returns a UniformBlock matching the program's layout. If name is empty,
- uniforms for the default uniform block (outside any uniform block
- declarations) are returned. */
- const UniformBlock *get_block(const Program &prog, const std::string &name) const;
-
- /// Creates blocks for the currently bound program and applies them.
+ /** Applies uniform blocks for the currently bound program, creating them
+ if needed. */
void apply() const;
};