]> git.tdb.fi Git - libs/gl.git/blobdiff - source/programdata.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / programdata.cpp
diff --git a/source/programdata.cpp b/source/programdata.cpp
deleted file mode 100644 (file)
index 0beb9e7..0000000
+++ /dev/null
@@ -1,364 +0,0 @@
-#include "buffer.h"
-#include "color.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;
-
-namespace Msp {
-namespace GL {
-
-ProgramData::ProgramData():
-       last_block(0),
-       buffer(0),
-       changes(NO_CHANGES)
-{ }
-
-// Blocks are intentionally left uncopied
-ProgramData::ProgramData(const ProgramData &other):
-       uniforms(other.uniforms),
-       last_block(0),
-       buffer(0),
-       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)
-{
-       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;
-               changes = KEYS_CHANGED;
-       }
-}
-
-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(const string &name, float v0, float v1)
-{
-       float va[2] = { v0, v1 };
-       uniform2(name, va);
-}
-
-void ProgramData::uniform2(const string &name, const float *v)
-{
-       uniform(name, new Uniform2f(v));
-}
-
-void ProgramData::uniform(const string &name, float v0, float v1, float v2)
-{
-       float va[3] = { v0, v1, v2 };
-       uniform3(name, va);
-}
-
-void ProgramData::uniform(const string &name, const Vector3 &v)
-{
-       uniform(name, v.x, v.y, v.z);
-}
-
-void ProgramData::uniform3(const string &name, const float *v)
-{
-       uniform(name, new Uniform3f(v));
-}
-
-void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3)
-{
-       float va[4] = { v0, v1, v2, v3 };
-       uniform4(name, va);
-}
-
-void ProgramData::uniform(const string &name, const Vector4 &v)
-{
-       uniform(name, v.x, v.y, v.z, v.w);
-}
-
-void ProgramData::uniform(const string &name, const Color &c)
-{
-       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_matrix2(const string &name, const float *v)
-{
-       uniform(name, new UniformMatrix2x2f(v));
-}
-
-void ProgramData::uniform_matrix3(const string &name, const float *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)
-{
-       uniform(name, new UniformArray<Uniform1f>(n, v));
-}
-
-void ProgramData::uniform2_array(const string &name, unsigned n, const float *v)
-{
-       uniform(name, new UniformArray<Uniform2f>(n, v));
-}
-
-void ProgramData::uniform3_array(const string &name, unsigned n, const float *v)
-{
-       uniform(name, new UniformArray<Uniform3f>(n, v));
-}
-
-void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
-{
-       uniform(name, new UniformArray<Uniform4f>(n, v));
-}
-
-void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v)
-{
-       uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
-}
-
-void ProgramData::find_uniforms_for_block(Block &block, const Program::UniformBlockInfo &info) const
-{
-       block.uniforms.clear();
-       for(vector<const Program::UniformInfo *>::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;
-       }
-}
-
-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 UniformBlock *ProgramData::get_block(const Program &prog, const Program::UniformBlockInfo *info) const
-{
-       if(changes)
-       {
-               for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-                       if(i->second.changes<changes)
-                               i->second.changes = changes;
-               changes = NO_CHANGES;
-       }
-
-       Program::LayoutHash layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
-
-       map<Program::LayoutHash, Block>::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;
-       }
-
-       if(!i->second.block)
-               return 0;
-
-       UniformBlock &block = *i->second.block;
-       if(i->second.changes)
-       {
-               if(info)
-               {
-                       vector<const Program::UniformInfo *>::const_iterator j = info->uniforms.begin();
-                       map<unsigned, const Uniform *const *>::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 &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
-{
-       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<const UniformBlock *, unsigned> ApplyBlock;
-               list<ApplyBlock> 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<ApplyBlock>::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<ProgramData>(pd)
-{
-       add("uniform1i", &Loader::uniform1i);
-       add("uniform1f", &Loader::uniform1f);
-       add("uniform2f", &Loader::uniform2f);
-       add("uniform3f", &Loader::uniform3f);
-       add("uniform4f", &Loader::uniform4f);
-}
-
-void ProgramData::Loader::uniform1i(const string &n, int v)
-{
-       obj.uniform(n, v);
-}
-
-void ProgramData::Loader::uniform1f(const string &n, float v)
-{
-       obj.uniform(n, v);
-}
-
-void ProgramData::Loader::uniform2f(const string &n, float v0, float v1)
-{
-       obj.uniform(n, v0, v1);
-}
-
-void ProgramData::Loader::uniform3f(const string &n, float v0, float v1, float v2)
-{
-       obj.uniform(n, v0, v1, v2);
-}
-
-void ProgramData::Loader::uniform4f(const string &n, float v0, float v1, float v2, float v3)
-{
-       obj.uniform(n, v0, v1, v2, v3);
-}
-
-} // namespace GL
-} // namespace Msp