X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=ed4b0a292b339ddc8c8bea858281949e96fca118;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hp=77ff7f5020aea9a792a6b7d8391d00c7a8e04e30;hpb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;p=libs%2Fgl.git diff --git a/source/programdata.cpp b/source/programdata.cpp index 77ff7f50..ed4b0a29 100644 --- a/source/programdata.cpp +++ b/source/programdata.cpp @@ -1,16 +1,12 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007-2008, 2010-2011 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include "arb_shader_objects.h" +#include "buffer.h" #include "color.h" -#include "extension.h" +#include "error.h" #include "matrix.h" #include "program.h" #include "programdata.h" #include "uniform.h" +#include "uniformblock.h" #include "vector.h" using namespace std; @@ -18,181 +14,294 @@ using namespace std; namespace Msp { namespace GL { -ProgramData::ProgramData(const Program &p): - program(p) +ProgramData::ProgramData(): + last_block(0), + buffer(0), + changes(NO_CHANGES) { - static RequireExtension _ext("GL_ARB_shader_objects"); + static Require _req(ARB_shader_objects); } +// Blocks are intentionally left uncopied ProgramData::ProgramData(const ProgramData &other): - program(other.program), - data(other.data) + uniforms(other.uniforms), + last_block(0), + buffer(0), + changes(NO_CHANGES) { - for(map::iterator i=data.begin(); i!=data.end(); ++i) + for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) i->second = i->second->clone(); } ProgramData::~ProgramData() { - for(map::iterator i=data.begin(); i!=data.end(); ++i) + 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(int index, Uniform *uni) +void ProgramData::uniform(const string &name, Uniform *uni) { - map::iterator i = data.find(index); - if(i!=data.end()) + 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 - data[index] = uni; + { + uniforms[name] = uni; + changes = KEYS_CHANGED; + } } -void ProgramData::uniform(int index, int v) +void ProgramData::uniform(const string &name, int v) { - if(index>=0) - uniform(index, new Uniform1i(v)); + uniform(name, new Uniform1i(v)); } -void ProgramData::uniform(int index, float v) +void ProgramData::uniform(const string &name, float v) { - if(index>=0) - uniform(index, new Uniform1f(v)); + uniform(name, new Uniform1f(v)); } -void ProgramData::uniform(int index, float v0, float v1) +void ProgramData::uniform(const string &name, float v0, float v1) { - if(index>=0) - uniform(index, new Uniform2f(v0, v1)); + float va[2] = { v0, v1 }; + uniform2(name, va); } -void ProgramData::uniform2(int index, const float *v) +void ProgramData::uniform2(const string &name, const float *v) { - uniform(index, v[0], v[1]); + uniform(name, new Uniform2f(v)); } -void ProgramData::uniform(int index, float v0, float v1, float v2) +void ProgramData::uniform(const string &name, float v0, float v1, float v2) { - if(index>=0) - uniform(index, new Uniform3f(v0, v1, v2)); + float va[3] = { v0, v1, v2 }; + uniform3(name, va); } -void ProgramData::uniform(int index, const Vector3 &v) +void ProgramData::uniform(const string &name, const Vector3 &v) { - uniform(index, v.x, v.y, v.z); + uniform(name, v.x, v.y, v.z); } -void ProgramData::uniform3(int index, const float *v) +void ProgramData::uniform3(const string &name, const float *v) { - uniform(index, v[0], v[1], v[2]); + uniform(name, new Uniform3f(v)); } -void ProgramData::uniform(int index, float v0, float v1, float v2, float v3) +void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3) { - if(index>=0) - uniform(index, new Uniform4f(v0, v1, v2, v3)); + float va[4] = { v0, v1, v2, v3 }; + uniform4(name, va); } -void ProgramData::uniform(int index, const Vector4 &v) +void ProgramData::uniform(const string &name, const Vector4 &v) { - uniform(index, v.x, v.y, v.z, v.w); + uniform(name, v.x, v.y, v.z, v.w); } -void ProgramData::uniform(int index, const Color &c) +void ProgramData::uniform(const string &name, const Color &c) { - uniform(index, c.r, c.g, c.b, c.a); + uniform(name, c.r, c.g, c.b, c.a); } -void ProgramData::uniform4(int index, const float *v) +void ProgramData::uniform4(const string &name, const float *v) { - uniform(index, v[0], v[1], v[2], v[3]); + uniform(name, new Uniform4f(v)); } -void ProgramData::uniform_matrix4(int index, const float *v) +void ProgramData::uniform_matrix4(const string &name, const float *v) { - if(index>=0) - uniform(index, new UniformMatrix4x4f(v)); + uniform(name, new UniformMatrix4x4f(v)); } -void ProgramData::uniform_matrix4(int index, const Matrix &m) +void ProgramData::uniform_matrix4(const string &name, const Matrix &m) { - if(index>=0) - { - float v[16]; - copy(m.data(), m.data()+16, v); - uniform_matrix4(index, v); - } + float v[16]; + copy(m.data(), m.data()+16, v); + uniform_matrix4(name, v); } -void ProgramData::uniform(const string &name, int v) +void ProgramData::uniform1_array(const string &name, unsigned n, const float *v) { - uniform(program.get_uniform_location(name), v); + uniform(name, new UniformArray(n, v)); } -void ProgramData::uniform(const string &name, float v) +void ProgramData::uniform2_array(const string &name, unsigned n, const float *v) { - uniform(program.get_uniform_location(name), v); + uniform(name, new UniformArray(n, v)); } -void ProgramData::uniform(const string &name, float v0, float v1) +void ProgramData::uniform3_array(const string &name, unsigned n, const float *v) { - uniform(program.get_uniform_location(name), v0, v1); + uniform(name, new UniformArray(n, v)); } -void ProgramData::uniform2(const string &name, const float *v) +void ProgramData::uniform4_array(const string &name, unsigned n, const float *v) { - uniform2(program.get_uniform_location(name), v); + uniform(name, new UniformArray(n, v)); } -void ProgramData::uniform(const string &name, float v0, float v1, float v2) +void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v) { - uniform(program.get_uniform_location(name), v0, v1, v2); + uniform(name, new UniformArray(n, v)); } -void ProgramData::uniform(const string &name, const Vector3 &v) +void ProgramData::find_uniforms_for_block(Block &block, const Program::UniformBlockInfo &info) const { - uniform(program.get_uniform_location(name), v); + block.uniforms.clear(); + for(vector::const_iterator i=info.uniforms.begin(); i!=info.uniforms.end(); ++i) + { + // XXX individual array elements + UniformMap::const_iterator j = uniforms.find((*i)->name); + if(j!=uniforms.end()) + block.uniforms[(*i)->location] = &j->second; + } } -void ProgramData::uniform3(const string &name, const float *v) +UniformBlock *ProgramData::create_block(const Program::UniformBlockInfo &info) const { - uniform3(program.get_uniform_location(name), v); + 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; } -void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3) +const UniformBlock *ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const { - uniform(program.get_uniform_location(name), v0, v1, v2, v3); -} + if(changes) + { + for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) + if(i->second.changessecond.changes = changes; + changes = NO_CHANGES; + } -void ProgramData::uniform(const string &name, const Vector4 &v) -{ - uniform(program.get_uniform_location(name), v); -} + unsigned layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash()); -void ProgramData::uniform4(const string &name, const float *v) -{ - uniform4(program.get_uniform_location(name), v); -} + map::iterator i = blocks.find(layout_hash); + if(i==blocks.end()) + { + i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first; + if(info) + { + 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; + } -void ProgramData::uniform_matrix4(const string &name, const float *v) -{ - uniform_matrix4(program.get_uniform_location(name), v); + if(!i->second.block) + return 0; + + UniformBlock &block = *i->second.block; + if(i->second.changes) + { + if(info) + { + 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()) + { + if(k->first==(*j)->location) + { + block.attach(**j, **k->second); + ++k; + } + ++j; + } + } + else + { + for(UniformMap::const_iterator j=uniforms.begin(); j!=uniforms.end(); ++j) + { + int loc = prog.get_uniform_location(j->first); + if(loc>=0) + block.attach(loc, *j->second); + } + } + i->second.changes = NO_CHANGES; + } + + return █ } -void ProgramData::uniform_matrix4(const string &name, const Matrix &m) +const UniformBlock *ProgramData::get_block(const Program &prog, const string &name) const { - uniform_matrix4(program.get_uniform_location(name), m); + if(name.empty()) + return get_block(prog, 0); + else + return get_block(prog, &prog.get_uniform_block_info(name)); } void ProgramData::apply() const { - for(map::const_iterator i=data.begin(); i!=data.end(); ++i) - i->second->apply(i->first); + const Program *prog = Program::current(); + if(!prog) + throw invalid_operation("ProgramData::apply"); + + const Program::UniformBlockMap &prog_blocks = prog->get_uniform_blocks(); + if(!prog_blocks.empty()) + { + 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); + } + + if(const UniformBlock *block = get_block(*prog, 0)) + block->apply(-1); } +ProgramData::Block::Block(): + changes(NO_CHANGES), + block(0) +{ } + + ProgramData::Loader::Loader(ProgramData &pd): DataFile::ObjectLoader(pd) {