X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=e1b4212e9d89588f78a42baf2d3e45d5a5a321db;hp=9ab0731d8164852352f12f38808e36a2f7aed37d;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d diff --git a/source/programdata.cpp b/source/programdata.cpp index 9ab0731d..e1b4212e 100644 --- a/source/programdata.cpp +++ b/source/programdata.cpp @@ -1,106 +1,256 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include "buffer.h" +#include "color.h" +#include "error.h" #include "extension.h" +#include "matrix.h" #include "program.h" #include "programdata.h" #include "uniform.h" +#include "uniformblock.h" +#include "vector.h" using namespace std; namespace Msp { namespace GL { -ProgramData::ProgramData() +ProgramData::ProgramData(): + last_block(0), + buffer(0), + modified(false) { static RequireExtension _ext("GL_ARB_shader_objects"); } +// Blocks are intentionally left uncopied ProgramData::ProgramData(const ProgramData &other): - data(other.data) + uniforms(other.uniforms), + last_block(0), + buffer(0), + modified(false) { - 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; } -void ProgramData::uniform(int index, Uniform *uni) +void ProgramData::uniform(const string &name, Uniform *uni) { - if(index<0) - { - delete uni; - return; - } - - map::iterator i = data.find(index); - if(i!=data.end()) + UniformMap::iterator i = uniforms.find(name); + if(i!=uniforms.end()) { delete i->second; i->second = uni; } else - data[index] = uni; + uniforms[name] = uni; + + modified = true; +} + +void ProgramData::uniform(const string &name, int v) +{ + uniform(name, new Uniform1i(v)); +} + +void ProgramData::uniform(const string &name, float v) +{ + uniform(name, new Uniform1f(v)); } -void ProgramData::uniform(int index, int v) +void ProgramData::uniform(const string &name, float v0, float v1) { - uniform(index, new Uniform1i(v)); + float va[2] = { v0, v1 }; + uniform2(name, va); } -void ProgramData::uniform(int index, float v) +void ProgramData::uniform2(const string &name, const float *v) { - uniform(index, new Uniform1f(v)); + uniform(name, new Uniform2f(v)); } -void ProgramData::uniform(int index, float v0, float v1) +void ProgramData::uniform(const string &name, float v0, float v1, float v2) { - uniform(index, new Uniform2f(v0, v1)); + float va[3] = { v0, v1, v2 }; + uniform3(name, va); } -void ProgramData::uniform2(int index, const float *v) +void ProgramData::uniform(const string &name, const Vector3 &v) { - uniform(index, v[0], v[1]); + uniform(name, v.x, v.y, v.z); } -void ProgramData::uniform(int index, float v0, float v1, float v2) +void ProgramData::uniform3(const string &name, const float *v) { - uniform(index, new Uniform3f(v0, v1, v2)); + uniform(name, new Uniform3f(v)); } -void ProgramData::uniform3(int index, const float *v) +void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3) { - uniform(index, v[0], v[1], v[2]); + float va[4] = { v0, v1, v2, v3 }; + uniform4(name, va); } -void ProgramData::uniform(int index, float v0, float v1, float v2, float v3) +void ProgramData::uniform(const string &name, const Vector4 &v) { - uniform(index, new Uniform4f(v0, v1, v2, v3)); + uniform(name, v.x, v.y, v.z, v.w); } -void ProgramData::uniform4(int index, const float *v) +void ProgramData::uniform(const string &name, const Color &c) { - uniform(index, v[0], v[1], v[2], v[3]); + uniform(name, c.r, c.g, c.b, c.a); +} + +void ProgramData::uniform4(const string &name, const float *v) +{ + uniform(name, new Uniform4f(v)); +} + +void ProgramData::uniform_matrix4(const string &name, const float *v) +{ + uniform(name, new UniformMatrix4x4f(v)); +} + +void ProgramData::uniform_matrix4(const string &name, const Matrix &m) +{ + float v[16]; + copy(m.data(), m.data()+16, v); + uniform_matrix4(name, v); +} + +void ProgramData::uniform1_array(const string &name, unsigned n, const float *v) +{ + uniform(name, new UniformArray(n, v)); +} + +void ProgramData::uniform2_array(const string &name, unsigned n, const float *v) +{ + uniform(name, new UniformArray(n, v)); +} + +void ProgramData::uniform3_array(const string &name, unsigned n, const float *v) +{ + uniform(name, new UniformArray(n, v)); +} + +void ProgramData::uniform4_array(const string &name, unsigned n, const float *v) +{ + uniform(name, new UniformArray(n, v)); +} + +void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v) +{ + uniform(name, new UniformArray(n, v)); +} + +const UniformBlock &ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const +{ + if(modified) + { + for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) + i->second.dirty = true; + modified = false; + } + + 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; + } + else + i->second.block = new UniformBlock; + } + + UniformBlock &block = *i->second.block; + if(i->second.dirty) + { + if(info) + { + for(vector::const_iterator j=info->uniforms.begin(); j!=info->uniforms.end(); ++j) + { + // XXX individual array elements + UniformMap::const_iterator k = uniforms.find((*j)->name); + if(k!=uniforms.end()) + block.attach(**j, *k->second); + } + } + 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.dirty = false; + } + + return block; +} + +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 { - 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) + { + 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, 0); + block.apply(-1); } -ProgramData::Loader::Loader(ProgramData &pd, Program &pr): - DataFile::ObjectLoader(pd), - prog(pr) +ProgramData::Block::Block(): + dirty(false), + block(0) +{ } + + +ProgramData::Loader::Loader(ProgramData &pd): + DataFile::ObjectLoader(pd) { add("uniform1i", &Loader::uniform1i); add("uniform1f", &Loader::uniform1f); @@ -111,27 +261,27 @@ ProgramData::Loader::Loader(ProgramData &pd, Program &pr): void ProgramData::Loader::uniform1i(const string &n, int v) { - obj.uniform(prog.get_uniform_location(n), v); + obj.uniform(n, v); } void ProgramData::Loader::uniform1f(const string &n, float v) { - obj.uniform(prog.get_uniform_location(n), v); + obj.uniform(n, v); } void ProgramData::Loader::uniform2f(const string &n, float v0, float v1) { - obj.uniform(prog.get_uniform_location(n), v0, v1); + obj.uniform(n, v0, v1); } void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2) { - obj.uniform(prog.get_uniform_location(n), v0, v1, v2); + obj.uniform(n, v0, v1, v2); } void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3) { - obj.uniform(prog.get_uniform_location(n), v0, v1, v2, v3); + obj.uniform(n, v0, v1, v2, v3); } } // namespace GL