X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=1287914005055ff91bb2102260daf4b28d50e710;hb=fa5b232a16e11d7950e80764497f0167ec9e3b41;hp=04fdd6b865053073435069696b968c5c90c48785;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2;p=libs%2Fgl.git diff --git a/source/programdata.cpp b/source/programdata.cpp index 04fdd6b8..12879140 100644 --- a/source/programdata.cpp +++ b/source/programdata.cpp @@ -1,7 +1,7 @@ +#include #include "buffer.h" #include "color.h" #include "error.h" -#include "extension.h" #include "matrix.h" #include "program.h" #include "programdata.h" @@ -17,9 +17,9 @@ namespace GL { ProgramData::ProgramData(): last_block(0), buffer(0), - modified(false) + changes(NO_CHANGES) { - static RequireExtension _ext("GL_ARB_shader_objects"); + static Require _req(ARB_shader_objects); } // Blocks are intentionally left uncopied @@ -27,18 +27,37 @@ ProgramData::ProgramData(const ProgramData &other): uniforms(other.uniforms), last_block(0), buffer(0), - modified(false) + changes(NO_CHANGES) { for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) i->second = i->second->clone(); } +ProgramData &ProgramData::operator=(const ProgramData &other) +{ + for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) + delete i->second; + uniforms.clear(); + + for(UniformMap::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i) + uniforms.insert(uniforms.end(), UniformMap::value_type(i->first, i->second->clone())); + + for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) + delete i->second.block; + blocks.clear(); + + changes = NO_CHANGES; + + return *this; +} + ProgramData::~ProgramData() { for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) delete i->second; for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) delete i->second.block; + delete buffer; } void ProgramData::uniform(const string &name, Uniform *uni) @@ -46,13 +65,18 @@ void ProgramData::uniform(const string &name, Uniform *uni) UniformMap::iterator i = uniforms.find(name); if(i!=uniforms.end()) { + /* UniformBlock does not copy the uniforms, so existing blocks will be + left with stale pointers. This is not a problem as long as no one stores + pointers to the blocks and expects them to stay valid. */ delete i->second; i->second = uni; + changes = VALUES_CHANGED; } else + { uniforms[name] = uni; - - modified = true; + changes = KEYS_CHANGED; + } } void ProgramData::uniform(const string &name, int v) @@ -113,16 +137,24 @@ void ProgramData::uniform4(const string &name, const float *v) uniform(name, new Uniform4f(v)); } -void ProgramData::uniform_matrix4(const string &name, const float *v) +void ProgramData::uniform_matrix2(const string &name, const float *v) { - uniform(name, new UniformMatrix4x4f(v)); + uniform(name, new UniformMatrix2x2f(v)); } -void ProgramData::uniform_matrix4(const string &name, const Matrix &m) +void ProgramData::uniform_matrix3(const string &name, const float *v) { - float v[16]; - copy(m.data(), m.data()+16, v); - uniform_matrix4(name, v); + uniform(name, new UniformMatrix3x3f(v)); +} + +void ProgramData::uniform(const string &name, const Matrix &m) +{ + uniform_matrix4(name, m.data()); +} + +void ProgramData::uniform_matrix4(const string &name, const float *v) +{ + uniform(name, new UniformMatrix4x4f(v)); } void ProgramData::uniform1_array(const string &name, unsigned n, const float *v) @@ -150,53 +182,94 @@ void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const fl uniform(name, new UniformArray(n, v)); } -const UniformBlock &ProgramData::get_block(const Program &prog, const string &name) const +void ProgramData::find_uniforms_for_block(Block &block, const Program::UniformBlockInfo &info) const { - if(modified) + block.uniforms.clear(); + for(vector::const_iterator i=info.uniforms.begin(); i!=info.uniforms.end(); ++i) { - for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) - i->second.dirty = true; - modified = false; + // XXX individual array elements + UniformMap::const_iterator j = uniforms.find((*i)->name); + if(j!=uniforms.end()) + block.uniforms[(*i)->location] = &j->second; + } +} + +UniformBlock *ProgramData::create_block(const Program::UniformBlockInfo &info) const +{ + UniformBlock *block = new UniformBlock(info.data_size); + if(!buffer) + { + buffer = new Buffer(UNIFORM_BUFFER); + buffer->set_usage(STREAM_DRAW); } + block->use_buffer(buffer, last_block); + last_block = block; + return block; +} - const Program::UniformBlockInfo *info = 0; - unsigned layout_hash; - if(!name.empty()) +const UniformBlock *ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const +{ + if(changes) { - info = &prog.get_uniform_block_info(name); - layout_hash = info->layout_hash; + for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) + if(i->second.changessecond.changes = changes; + changes = NO_CHANGES; } - else - layout_hash = prog.get_uniform_layout_hash(); + + unsigned layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash()); map::iterator i = blocks.find(layout_hash); if(i==blocks.end()) { i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first; - i->second.dirty = true; if(info) { - i->second.block = new UniformBlock(info->data_size); - if(!buffer) - buffer = new Buffer(UNIFORM_BUFFER); - i->second.block->use_buffer(buffer, last_block); - last_block = i->second.block; + find_uniforms_for_block(i->second, *info); + + if(!i->second.uniforms.empty()) + { + i->second.block = create_block(*info); + i->second.changes = VALUES_CHANGED; + } } else + { i->second.block = new UniformBlock; + i->second.changes = VALUES_CHANGED; + } } + else if(info && i->second.changes==KEYS_CHANGED) + { + find_uniforms_for_block(i->second, *info); + if(!i->second.uniforms.empty()) + { + if(!i->second.block) + i->second.block = create_block(*info); + i->second.changes = VALUES_CHANGED; + } + else + i->second.changes = NO_CHANGES; + } + + if(!i->second.block) + return 0; UniformBlock &block = *i->second.block; - if(i->second.dirty) + if(i->second.changes) { if(info) { - for(vector::const_iterator j=info->uniforms.begin(); j!=info->uniforms.end(); ++j) + vector::const_iterator j = info->uniforms.begin(); + map::const_iterator k = i->second.uniforms.begin(); + while(j!=info->uniforms.end() && k!=i->second.uniforms.end()) { - // XXX individual array elements - UniformMap::const_iterator k = uniforms.find((*j)->name); - if(k!=uniforms.end()) - block.attach(**j, *k->second); + if(k->first==(*j)->location) + { + block.attach(**j, **k->second); + ++k; + } + ++j; } } else @@ -208,10 +281,18 @@ const UniformBlock &ProgramData::get_block(const Program &prog, const string &na block.attach(loc, *j->second); } } - i->second.dirty = false; + i->second.changes = NO_CHANGES; } - return block; + return █ +} + +const UniformBlock *ProgramData::get_block(const Program &prog, const string &name) const +{ + if(name.empty()) + return get_block(prog, 0); + else + return get_block(prog, &prog.get_uniform_block_info(name)); } void ProgramData::apply() const @@ -221,19 +302,28 @@ void ProgramData::apply() const throw invalid_operation("ProgramData::apply"); const Program::UniformBlockMap &prog_blocks = prog->get_uniform_blocks(); - for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i) + if(!prog_blocks.empty()) { - const UniformBlock &block = get_block(*prog, i->second.name); - block.apply(i->second.bind_point); + typedef pair ApplyBlock; + list apply_blocks; + for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i) + if(const UniformBlock *block = get_block(*prog, &i->second)) + apply_blocks.push_back(make_pair(block, i->second.bind_point)); + + if(buffer) + buffer->bind(); + + for(list::const_iterator i=apply_blocks.begin(); i!=apply_blocks.end(); ++i) + i->first->apply(i->second); } - const UniformBlock &block = get_block(*prog, string()); - block.apply(-1); + if(const UniformBlock *block = get_block(*prog, 0)) + block->apply(-1); } ProgramData::Block::Block(): - dirty(false), + changes(NO_CHANGES), block(0) { }