void ProgramData::mark_dirty(Mask bits)
{
if(!dirty)
+ {
+ if(generation && !streaming)
+ {
+ streaming = true;
+ if(buffer && buffer->get_size())
+ recreate_buffer();
+ }
++generation;
+ }
dirty |= bits;
}
return programs.begin()+index;
}
+void ProgramData::recreate_buffer() const
+{
+ Buffer *old_buffer = buffer;
+ // Create the new buffer first to ensure it has a different address
+ buffer = new Buffer;
+ delete old_buffer;
+ if(last_buffer_block)
+ last_buffer_block->change_buffer(buffer);
+
+#ifdef DEBUG
+ if(!debug_name.empty())
+ buffer->set_debug_name(debug_name);
+#endif
+}
+
void ProgramData::update_block_uniform_indices(SharedBlock &block, const ReflectData::UniformBlockInfo &info) const
{
uint8_t *indices = block.indices.values;
if(info.bind_point>=0)
{
if(!buffer)
- {
- buffer = new Buffer();
-
-#ifdef DEBUG
- if(!debug_name.empty())
- buffer->set_debug_name(debug_name);
-#endif
- }
+ recreate_buffer();
block.block->use_buffer(buffer, last_buffer_block);
last_buffer_block = block.block;
prog_begin->masks.dirty = 0;
- if(last_buffer_block!=old_last_block)
+ if(last_buffer_block!=old_last_block || (buffer && !buffer->get_size()))
{
- unsigned required_size = last_buffer_block->get_required_buffer_size();
+ unsigned required_size = last_buffer_block->get_required_buffer_size(streaming);
if(last_buffer_block->get_required_buffer_size()>buffer->get_size())
{
if(buffer->get_size()>0)
- {
- delete buffer;
- buffer = new Buffer();
- last_buffer_block->change_buffer(buffer);
+ recreate_buffer();
-#ifdef DEBUG
- if(!debug_name.empty())
- buffer->set_debug_name(debug_name);
-#endif
- }
-
- buffer->storage(required_size);
+ buffer->storage(required_size, (streaming ? STREAMING : STATIC));
}
}
}
return prog_begin;
}
-void ProgramData::apply(const Program &prog, PipelineState &state) const
+void ProgramData::apply(const Program &prog, PipelineState &state, unsigned frame) const
{
auto prog_begin = prepare_program(prog);
ReflectData::LayoutHash prog_hash = prog_begin->prog_hash;
+
for(auto i=prog_begin+1; (i!=programs.end() && i->prog_hash==prog_hash); ++i)
if(i->block)
{
state.set_uniform_block(i->bind_point, i->block);
if(i->bind_point>=0)
- i->block->refresh();
+ i->block->refresh(frame);
}
}