#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(const Program &p):
- program(p)
+ProgramData::ProgramData():
+ modified(false)
{
static RequireExtension _ext("GL_ARB_shader_objects");
}
+// Blocks are intentionally left uncopied
ProgramData::ProgramData(const ProgramData &other):
- program(other.program),
- data(other.data)
+ uniforms(other.uniforms),
+ modified(false)
{
- for(map<int, Uniform *>::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<int, Uniform *>::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)
{
- map<int, Uniform *>::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;
-}
-
-void ProgramData::uniform(int index, int v)
-{
- if(index>=0)
- uniform(index, new Uniform1i(v));
-}
-
-void ProgramData::uniform(int index, float v)
-{
- if(index>=0)
- uniform(index, new Uniform1f(v));
-}
-
-void ProgramData::uniform(int index, float v0, float v1)
-{
- if(index>=0)
- uniform(index, new Uniform2f(v0, v1));
-}
-
-void ProgramData::uniform2(int index, const float *v)
-{
- uniform(index, v[0], v[1]);
-}
-
-void ProgramData::uniform(int index, float v0, float v1, float v2)
-{
- if(index>=0)
- uniform(index, new Uniform3f(v0, v1, v2));
-}
-
-void ProgramData::uniform(int index, const Vector3 &v)
-{
- uniform(index, v.x, v.y, v.z);
-}
-
-void ProgramData::uniform3(int index, const float *v)
-{
- uniform(index, v[0], v[1], v[2]);
-}
-
-void ProgramData::uniform(int index, float v0, float v1, float v2, float v3)
-{
- if(index>=0)
- uniform(index, new Uniform4f(v0, v1, v2, v3));
-}
-
-void ProgramData::uniform(int index, const Vector4 &v)
-{
- uniform(index, v.x, v.y, v.z, v.w);
-}
-
-void ProgramData::uniform(int index, const Color &c)
-{
- uniform(index, c.r, c.g, c.b, c.a);
-}
-
-void ProgramData::uniform4(int index, const float *v)
-{
- uniform(index, v[0], v[1], v[2], v[3]);
-}
+ uniforms[name] = uni;
-void ProgramData::uniform_matrix4(int index, const float *v)
-{
- if(index>=0)
- uniform(index, new UniformMatrix4x4f(v));
-}
-
-void ProgramData::uniform_matrix4(int index, const Matrix &m)
-{
- if(index>=0)
- {
- float v[16];
- copy(m.data(), m.data()+16, v);
- uniform_matrix4(index, v);
- }
+ modified = true;
}
void ProgramData::uniform(const string &name, int v)
{
- uniform(program.get_uniform_location(name), v);
+ uniform(name, new Uniform1i(v));
}
void ProgramData::uniform(const string &name, float v)
{
- uniform(program.get_uniform_location(name), v);
+ uniform(name, new Uniform1f(v));
}
void ProgramData::uniform(const string &name, float v0, float v1)
{
- uniform(program.get_uniform_location(name), v0, v1);
+ uniform(name, new Uniform2f(v0, v1));
}
void ProgramData::uniform2(const string &name, const float *v)
{
- uniform2(program.get_uniform_location(name), v);
+ uniform(name, v[0], v[1]);
}
void ProgramData::uniform(const string &name, float v0, float v1, float v2)
{
- uniform(program.get_uniform_location(name), v0, v1, v2);
+ uniform(name, new Uniform3f(v0, v1, v2));
}
void ProgramData::uniform(const string &name, const Vector3 &v)
{
- uniform(program.get_uniform_location(name), v);
+ uniform(name, v.x, v.y, v.z);
}
void ProgramData::uniform3(const string &name, const float *v)
{
- uniform3(program.get_uniform_location(name), v);
+ uniform(name, v[0], v[1], v[2]);
}
void ProgramData::uniform(const string &name, float v0, float v1, float v2, float v3)
{
- uniform(program.get_uniform_location(name), v0, v1, v2, v3);
+ uniform(name, new Uniform4f(v0, v1, v2, v3));
}
void ProgramData::uniform(const string &name, const Vector4 &v)
{
- uniform(program.get_uniform_location(name), 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)
{
- uniform4(program.get_uniform_location(name), v);
+ uniform(name, v[0], v[1], v[2], v[3]);
}
void ProgramData::uniform_matrix4(const string &name, const float *v)
{
- uniform_matrix4(program.get_uniform_location(name), v);
+ uniform(name, new UniformMatrix4x4f(v));
}
void ProgramData::uniform_matrix4(const string &name, const Matrix &m)
{
- uniform_matrix4(program.get_uniform_location(name), m);
+ float v[16];
+ copy(m.data(), m.data()+16, v);
+ uniform_matrix4(name, v);
+}
+
+const UniformBlock &ProgramData::get_block(const Program &prog) const
+{
+ if(modified)
+ {
+ for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ i->second.dirty = true;
+ modified = false;
+ }
+
+ unsigned layout_hash = prog.get_uniform_layout_hash();
+ map<unsigned, Block>::iterator i = blocks.find(layout_hash);
+ if(i==blocks.end())
+ {
+ i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first;
+ i->second.dirty = true;
+ i->second.block = new UniformBlock;
+ }
+
+ UniformBlock &block = *i->second.block;
+ if(i->second.dirty)
+ {
+ for(UniformMap::const_iterator j=uniforms.begin(); j!=uniforms.end(); ++j)
+ {
+ int loc = prog.get_uniform_location(j->first);
+ if(loc>=0)
+ block.uniform(loc, *j->second);
+ }
+ i->second.dirty = false;
+ }
+
+ return block;
}
void ProgramData::apply() const
{
- for(map<int, Uniform *>::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 UniformBlock &block = get_block(*prog);
+ block.apply(-1);
}
+ProgramData::Block::Block():
+ dirty(false),
+ block(0)
+{ }
+
+
ProgramData::Loader::Loader(ProgramData &pd):
DataFile::ObjectLoader<ProgramData>(pd)
{
projects / libs / gl.git / blobdiff