ProgramData::ProgramData(const Program *p):
tied_program(p),
+ generation(0),
last_buffer_block(0),
buffer(0),
dirty(0)
ProgramData::ProgramData(const ProgramData &other):
tied_program(other.tied_program),
uniforms(other.uniforms),
+ generation(other.generation),
last_buffer_block(0),
buffer(0),
dirty(0)
return add_uniform(tag, uni);
uniforms[i].replace_value(uni);
- dirty |= 1<<i;
+ mark_dirty(1<<i);
}
template<typename T, typename V>
else
uniforms[i].replace_value(new T(value));
- dirty |= 1<<i;
+ mark_dirty(1<<i);
}
template<typename T, typename V>
else
uniforms[i].replace_value(new UniformArray<T>(n, value));
- dirty |= 1<<i;
+ mark_dirty(1<<i);
}
bool ProgramData::validate_tag(Tag tag) const
nu.value = uni;
uniforms.insert(j, nu);
- dirty = ALL_ONES;
+ mark_dirty(ALL_ONES);
+}
+
+void ProgramData::mark_dirty(Mask bits)
+{
+ if(!dirty)
+ ++generation;
+ dirty |= bits;
}
void ProgramData::uniform(Tag tag, const Uniform &u)
uniform3(tag, va);
}
-void ProgramData::uniform(Tag tag, const Vector3 &v)
-{
- uniform(tag, v.x, v.y, v.z);
-}
-
void ProgramData::uniform3(Tag tag, const int *v)
{
uniform<Uniform3i>(tag, v);
uniform4(tag, va);
}
-void ProgramData::uniform(Tag tag, const Vector4 &v)
-{
- uniform(tag, v.x, v.y, v.z, v.w);
-}
-
void ProgramData::uniform(Tag tag, const Color &c)
{
uniform(tag, c.r, c.g, c.b, c.a);
uniform<Uniform4f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 2, 2> &m)
-{
- uniform_matrix2(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix2(Tag tag, const float *v)
{
uniform<UniformMatrix2x2f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 2, 3> &m)
-{
- uniform_matrix3x2(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix3x2(Tag tag, const float *v)
{
uniform<UniformMatrix3x2f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 2, 4> &m)
-{
- uniform_matrix4x2(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix4x2(Tag tag, const float *v)
{
uniform<UniformMatrix4x2f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 3, 2> &m)
-{
- uniform_matrix2x3(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix2x3(Tag tag, const float *v)
{
uniform<UniformMatrix2x3f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 3, 3> &m)
-{
- uniform_matrix3(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix3(Tag tag, const float *v)
{
uniform<UniformMatrix3x3f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 3, 4> &m)
-{
- uniform_matrix4x3(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix4x3(Tag tag, const float *v)
{
uniform<UniformMatrix4x3f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 4, 2> &m)
-{
- uniform_matrix2x4(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix2x4(Tag tag, const float *v)
{
uniform<UniformMatrix2x4f>(tag, v);
}
-void ProgramData::uniform(Tag tag, const LinAl::Matrix<float, 4, 3> &m)
-{
- uniform_matrix3x4(tag, &m(0, 0));
-}
-
void ProgramData::uniform_matrix3x4(Tag tag, const float *v)
{
uniform<UniformMatrix3x4f>(tag, v);
uniform<UniformMatrix4x4f>(tag, v);
}
+void ProgramData::uniform_array(Tag tag, unsigned n, const int *v)
+{
+ uniform_array<Uniform1i>(tag, n, v);
+}
+
+void ProgramData::uniform_array(Tag tag, unsigned n, const float *v)
+{
+ uniform_array<Uniform1f>(tag, n, v);
+}
+
void ProgramData::uniform1_array(Tag tag, unsigned n, const int *v)
{
uniform_array<Uniform1i>(tag, n, v);
delete i->value;
uniforms.erase(i);
- dirty = ALL_ONES;
+ mark_dirty(ALL_ONES);
}
vector<Tag> ProgramData::get_uniform_tags() const
if(info.bind_point>=0)
{
if(!buffer)
+ {
buffer = new Buffer(UNIFORM_BUFFER);
+#ifdef DEBUG
+ if(!debug_name.empty())
+ buffer->set_debug_name(debug_name);
+#endif
+ }
+
BufferBackedUniformBlock *bb_block = new BufferBackedUniformBlock(info.data_size);
block.block = bb_block;
bb_block->use_buffer(buffer, last_buffer_block);
delete buffer;
buffer = new Buffer(UNIFORM_BUFFER);
last_buffer_block->change_buffer(buffer);
+
+#ifdef DEBUG
+ if(!debug_name.empty())
+ buffer->set_debug_name(debug_name);
+#endif
}
buffer->storage(required_size);
i->block->apply(i->bind_point);
}
+void ProgramData::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+ debug_name = name;
+ if(buffer)
+ buffer->set_debug_name(name);
+#else
+ (void)name;
+#endif
+}
+
ProgramData::TaggedUniform::TaggedUniform():
value(0)