ProgramData::ProgramData(const Program *p):
tied_program(p),
- last_block(0),
+ generation(0),
+ last_buffer_block(0),
buffer(0),
dirty(0)
{ }
ProgramData::ProgramData(const ProgramData &other):
tied_program(other.tied_program),
uniforms(other.uniforms),
- last_block(0),
+ generation(other.generation),
+ last_buffer_block(0),
buffer(0),
dirty(0)
{
ProgramData::ProgramData(const ProgramData &other, const Program *p):
tied_program(p),
- last_block(0),
+ last_buffer_block(0),
buffer(0),
dirty(0)
{
delete i->block;
programs.clear();
- last_block = 0;
+ 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
#endif
{
if(tied_program)
- tied_program->get_uniform_info(tag);
+ {
+ const Program::UniformInfo &info = tied_program->get_uniform_info(tag);
+ if(is_image(info.type))
+ throw invalid_operation("ProgramData::uniform");
+ }
return true;
}
#ifdef DEBUG
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(!buffer)
buffer = new Buffer(UNIFORM_BUFFER);
- block.block = new UniformBlock(info.data_size);
- block.block->use_buffer(buffer, last_block);
- last_block = block.block;
+ BufferBackedUniformBlock *bb_block = new BufferBackedUniformBlock(info.data_size);
+ block.block = bb_block;
+ bb_block->use_buffer(buffer, last_buffer_block);
+ last_buffer_block = bb_block;
}
else
- block.block = new UniformBlock;
+ block.block = new DefaultUniformBlock;
}
}
{
const UInt8 *indices = block.get_uniform_indices();
for(unsigned i=0; i<info.uniforms.size(); ++i)
- if(indices[i]!=0xFF)
+ {
+ if(is_image(info.uniforms[i]->type))
+ ; // Temporarily ignore deprecated use of sampler uniforms in ProgramData
+ else if(indices[i]!=0xFF)
block.block->attach(*info.uniforms[i], *uniforms[indices[i]].value);
+ }
}
void ProgramData::apply() const
if(!prog)
throw invalid_operation("ProgramData::apply");
- UniformBlock *old_last_block = last_block;
+ BufferBackedUniformBlock *old_last_block = last_buffer_block;
vector<ProgramBlock>::iterator prog_begin = get_program(*prog);
Program::LayoutHash prog_hash = prog->get_uniform_layout_hash();
if(buffered_blocks_updated && !ARB_direct_state_access)
buffer->bind();
- if(last_block!=old_last_block)
+ if(last_buffer_block!=old_last_block)
{
- unsigned required_size = last_block->get_required_buffer_size();
- if(last_block->get_required_buffer_size()>buffer->get_size())
+ unsigned required_size = last_buffer_block->get_required_buffer_size();
+ if(last_buffer_block->get_required_buffer_size()>buffer->get_size())
{
if(buffer->get_size()>0)
{
delete buffer;
buffer = new Buffer(UNIFORM_BUFFER);
- last_block->change_buffer(buffer);
+ last_buffer_block->change_buffer(buffer);
}
buffer->storage(required_size);