]> 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 535ade9..0000000
+++ /dev/null
@@ -1,386 +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),
-       dirty(0)
-{ }
-
-// Blocks are intentionally left uncopied
-ProgramData::ProgramData(const ProgramData &other):
-       uniform_slots(other.uniform_slots),
-       uniforms(other.uniforms),
-       last_block(0),
-       buffer(0),
-       dirty(0)
-{
-       for(vector<Uniform *>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-               *i = (*i)->clone();
-}
-
-ProgramData &ProgramData::operator=(const ProgramData &other)
-{
-       for(vector<Uniform *>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-               delete *i;
-       uniforms.clear();
-
-       uniform_slots = other.uniform_slots;
-       for(vector<Uniform *>::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i)
-               uniforms.push_back((*i)->clone());
-
-       for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-               delete i->second.block;
-       programs.clear();
-
-       last_block = 0;
-       buffer = 0;
-       dirty = 0;
-
-       return *this;
-}
-
-ProgramData::~ProgramData()
-{
-       for(vector<Uniform *>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-               delete *i;
-       for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-               delete i->second.block;
-       delete buffer;
-}
-
-void ProgramData::uniform(const string &name, Uniform *uni)
-{
-       if(name[name.size()-1]==']')
-               throw invalid_argument("ProgramData::uniform");
-
-       SlotMap::iterator i = uniform_slots.find(name);
-       if(i!=uniform_slots.end())
-       {
-               Uniform *&slot = uniforms[i->second];
-               /* UniformBlock does not copy the uniforms, so existing default 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 slot;
-               slot = uni;
-
-               if(i->second<MASK_BITS)
-                       dirty |= 1<<i->second;
-               else  // Force a full update if the mask isn't wide enough
-                       dirty = ALL_ONES;
-       }
-       else
-       {
-               uniform_slots[name] = uniforms.size();
-               uniforms.push_back(uni);
-               dirty = ALL_ONES;
-       }
-}
-
-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));
-}
-
-unsigned ProgramData::compute_slot_mask(const Program::UniformBlockInfo &block) const
-{
-       unsigned mask = 0;
-       for(vector<const Program::UniformInfo *>::const_iterator i=block.uniforms.begin(); i!=block.uniforms.end(); ++i)
-       {
-               SlotMap::const_iterator j = uniform_slots.find((*i)->name);
-               if(j!=uniform_slots.end() && j->second<MASK_BITS)
-                       mask |= 1<<j->second;
-       }
-
-       return mask;
-}
-
-void ProgramData::update_block(UniformBlock &block, const Program::UniformBlockInfo &info) const
-{
-       for(vector<const Program::UniformInfo *>::const_iterator i=info.uniforms.begin(); i!=info.uniforms.end(); ++i)
-       {
-               SlotMap::const_iterator j = uniform_slots.find((*i)->name);
-               if(j!=uniform_slots.end())
-                       block.attach(**i, *uniforms[j->second]);
-       }
-}
-
-ProgramData::SharedBlock *ProgramData::get_shared_block(const Program::UniformBlockInfo &info) const
-{
-       BlockMap::iterator i = blocks.find(info.layout_hash);
-       if(i==blocks.end())
-       {
-               unsigned used = compute_slot_mask(info);
-               if(!used)
-                       return 0;
-
-               UniformBlock *block;
-               if(info.bind_point>=0)
-               {
-                       if(!buffer)
-                       {
-                               buffer = new Buffer(UNIFORM_BUFFER);
-                               buffer->set_usage(STREAM_DRAW);
-                       }
-
-                       block = new UniformBlock(info.data_size);
-                       block->use_buffer(buffer, last_block);
-                       last_block = block;
-               }
-               else
-                       block = new UniformBlock;
-
-               i = blocks.insert(BlockMap::value_type(info.layout_hash, SharedBlock(used, block))).first;
-       }
-
-       return &i->second;
-}
-
-void ProgramData::apply() const
-{
-       const Program *prog = Program::current();
-       if(!prog)
-               throw invalid_operation("ProgramData::apply");
-
-       Program::LayoutHash layout = prog->get_uniform_layout_hash();
-       ProgramUniforms &pu = programs[layout];
-
-       if((dirty&pu.used)|pu.dirty)
-       {
-               /* If the global dirty flag affects this program, add it to per-program
-               dirty flags and clear the global flag.  A previously unseen program will
-               always cause this to happen. */
-               if(dirty&pu.used)
-               {
-                       Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
-                       for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-                               i->second.dirty |= (dirty&i->second.used) | force_dirty;
-                       for(ProgramMap::iterator i=programs.begin(); i!=programs.end(); ++i)
-                               i->second.dirty |= (dirty&i->second.used) | force_dirty;
-                       dirty = 0;
-               }
-
-               const Program::UniformBlockMap &prog_blocks = prog->get_uniform_blocks();
-
-               if(pu.dirty==ALL_ONES)
-               {
-                       /* The set of uniforms has changed since this program was last used.
-                       Regenerate the list of uniform blocks. */
-                       pu.blocks.clear();
-                       pu.blocks.reserve(prog_blocks.size());
-
-                       pu.used = 0;
-                       for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i)
-                       {
-                               SharedBlock *shared = get_shared_block(i->second);
-                               if(shared)
-                               {
-                                       if(shared->dirty==ALL_ONES)
-                                               shared->used = compute_slot_mask(i->second);
-                                       pu.used |= shared->used;
-                               }
-
-                               pu.blocks.push_back(ProgramBlock(i->second.bind_point, shared));
-                       }
-               }
-
-               // Update the contents of all dirty blocks.
-               bool buffered_blocks_updated = false;
-               std::vector<ProgramBlock>::iterator j = pu.blocks.begin();
-               for(Program::UniformBlockMap::const_iterator i=prog_blocks.begin(); i!=prog_blocks.end(); ++i, ++j)
-               {
-                       if(!j->shared || !j->shared->dirty)
-                               continue;
-
-                       update_block(*j->block, i->second);
-                       j->shared->dirty = 0;
-                       buffered_blocks_updated |= (j->bind_point>=0);
-               }
-
-               pu.dirty = 0;
-
-               /* If any blocks stored in the buffer were updated, bind the buffer here
-               to avoid state thrashing. */
-               if(buffered_blocks_updated)
-                       buffer->bind();
-       }
-
-       for(vector<ProgramBlock>::iterator i=pu.blocks.begin(); i!=pu.blocks.end(); ++i)
-               if(i->block)
-                       i->block->apply(i->bind_point);
-}
-
-
-ProgramData::SharedBlock::SharedBlock(unsigned u, UniformBlock *b):
-       used(u),
-       dirty(u),
-       block(b)
-{ }
-
-
-ProgramData::ProgramBlock::ProgramBlock():
-       bind_point(-1),
-       block(0),
-       shared(0)
-{ }
-
-ProgramData::ProgramBlock::ProgramBlock(int p, SharedBlock *b):
-       bind_point(p),
-       block(b ? b->block : 0),
-       shared(b)
-{ }
-
-
-ProgramData::ProgramUniforms::ProgramUniforms():
-       used(ALL_ONES),
-       dirty(ALL_ONES)
-{ }
-
-
-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