// Blocks are intentionally left uncopied
ProgramData::ProgramData(const ProgramData &other):
+ uniform_slots(other.uniform_slots),
uniforms(other.uniforms),
last_block(0),
buffer(0),
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());
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(name, new Uniform4f(v));
}
+void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 2> &m)
+{
+ uniform_matrix2(name, &m(0, 0));
+}
+
void ProgramData::uniform_matrix2(const string &name, const float *v)
{
uniform(name, new UniformMatrix2x2f(v));
}
+void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 3> &m)
+{
+ uniform_matrix3(name, &m(0, 0));
+}
+
void ProgramData::uniform_matrix3(const string &name, const float *v)
{
uniform(name, new UniformMatrix3x3f(v));
Program::LayoutHash layout = prog->get_uniform_layout_hash();
ProgramUniforms &pu = programs[layout];
- if((dirty&pu.used)|pu.dirty)
+ Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
+ Mask affected = (dirty&pu.used) | force_dirty;
+ if(affected|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)
+ if(affected)
{
- 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)