tied_program(p)
{ }
-// Blocks are intentionally left uncopied
-ProgramData::ProgramData(const ProgramData &other):
+ProgramData::ProgramData(ProgramData &&other):
tied_program(other.tied_program),
- uniforms(other.uniforms),
- uniform_data(other.uniform_data),
- generation(other.generation)
-{ }
-
-ProgramData::ProgramData(const ProgramData &other, const Program *p):
- tied_program(p)
-{
- if(tied_program)
- {
- for(const TaggedUniform &u: other.uniforms)
- validate_tag(u.tag);
- }
-
- uniforms = other.uniforms;
- uniform_data = other.uniform_data;
-}
-
-ProgramData &ProgramData::operator=(const ProgramData &other)
+ uniforms(move(other.uniforms)),
+ uniform_data(move(other.uniform_data)),
+ generation(other.generation),
+ blocks(move(other.blocks)),
+ programs(move(other.programs)),
+ last_buffer_block(other.last_buffer_block),
+ buffer(other.buffer),
+ dirty(other.dirty),
+ debug_name(move(other.debug_name))
{
- tied_program = other.tied_program;
-
- uniforms = other.uniforms;
- uniform_data = other.uniform_data;
-
- for(SharedBlock &b: blocks)
- delete b.block;
- blocks.clear();
- programs.clear();
-
- last_buffer_block = 0;
- buffer = 0;
- dirty = 0;
-
- return *this;
+ other.blocks.clear();
+ other.buffer = 0;
}
ProgramData::~ProgramData()
void ProgramData::mark_dirty(Mask bits)
{
if(!dirty)
+ {
+ if(generation && !streaming)
+ {
+ streaming = true;
+ if(buffer && buffer->get_size())
+ recreate_buffer();
+ }
++generation;
+ }
dirty |= bits;
}
uniform(tag, INT, 1, &v);
}
+void ProgramData::uniform(Tag tag, unsigned v)
+{
+ uniform(tag, UNSIGNED_INT, 1, &v);
+}
+
void ProgramData::uniform(Tag tag, float v)
{
uniform(tag, FLOAT, 1, &v);
uniform2(tag, va);
}
+void ProgramData::uniform(Tag tag, unsigned v0, unsigned v1)
+{
+ unsigned va[2] = { v0, v1 };
+ uniform2(tag, va);
+}
+
void ProgramData::uniform(Tag tag, float v0, float v1)
{
float va[2] = { v0, v1 };
uniform(tag, INT_VEC2, 1, v);
}
+void ProgramData::uniform2(Tag tag, const unsigned *v)
+{
+ uniform(tag, UINT_VEC2, 1, v);
+}
+
void ProgramData::uniform2(Tag tag, const float *v)
{
uniform(tag, FLOAT_VEC2, 1, v);
uniform3(tag, va);
}
+void ProgramData::uniform(Tag tag, unsigned v0, unsigned v1, unsigned v2)
+{
+ unsigned va[3] = { v0, v1, v2 };
+ uniform3(tag, va);
+}
+
void ProgramData::uniform(Tag tag, float v0, float v1, float v2)
{
float va[3] = { v0, v1, v2 };
uniform(tag, INT_VEC3, 1, v);
}
+void ProgramData::uniform3(Tag tag, const unsigned *v)
+{
+ uniform(tag, UINT_VEC3, 1, v);
+}
+
void ProgramData::uniform3(Tag tag, const float *v)
{
uniform(tag, FLOAT_VEC3, 1, v);
uniform4(tag, va);
}
+void ProgramData::uniform(Tag tag, unsigned v0, unsigned v1, unsigned v2, unsigned v3)
+{
+ unsigned va[4] = { v0, v1, v2, v3 };
+ uniform4(tag, va);
+}
+
void ProgramData::uniform(Tag tag, float v0, float v1, float v2, float v3)
{
float va[4] = { v0, v1, v2, v3 };
uniform(tag, INT_VEC4, 1, v);
}
+void ProgramData::uniform4(Tag tag, const unsigned *v)
+{
+ uniform(tag, UINT_VEC4, 1, v);
+}
+
void ProgramData::uniform4(Tag tag, const float *v)
{
uniform(tag, FLOAT_VEC4, 1, v);
uniform(tag, INT, n, v);
}
+void ProgramData::uniform_array(Tag tag, unsigned n, const unsigned *v)
+{
+ uniform(tag, UNSIGNED_INT, n, v);
+}
+
void ProgramData::uniform_array(Tag tag, unsigned n, const float *v)
{
uniform(tag, FLOAT, n, v);
uniform(tag, INT, n, v);
}
+void ProgramData::uniform1_array(Tag tag, unsigned n, const unsigned *v)
+{
+ uniform(tag, UNSIGNED_INT, n, v);
+}
+
void ProgramData::uniform1_array(Tag tag, unsigned n, const float *v)
{
uniform(tag, FLOAT, n, v);
uniform(tag, INT_VEC2, n, v);
}
+void ProgramData::uniform2_array(Tag tag, unsigned n, const unsigned *v)
+{
+ uniform(tag, UINT_VEC2, n, v);
+}
+
void ProgramData::uniform2_array(Tag tag, unsigned n, const float *v)
{
uniform(tag, FLOAT_VEC2, n, v);
uniform(tag, INT_VEC3, n, v);
}
+void ProgramData::uniform3_array(Tag tag, unsigned n, const unsigned *v)
+{
+ uniform(tag, INT_VEC3, n, v);
+}
+
void ProgramData::uniform3_array(Tag tag, unsigned n, const float *v)
{
uniform(tag, FLOAT_VEC3, n, v);
uniform(tag, INT_VEC4, n, v);
}
+void ProgramData::uniform4_array(Tag tag, unsigned n, const unsigned *v)
+{
+ uniform(tag, UINT_VEC4, n, v);
+}
+
void ProgramData::uniform4_array(Tag tag, unsigned n, const float *v)
{
uniform(tag, FLOAT_VEC4, n, v);
uniform(tag, tu.type, tu.array_size, source.uniform_data.data()+tu.data_offset);
}
+void ProgramData::copy_uniforms(const ProgramData &source)
+{
+ for(const TaggedUniform &u: source.uniforms)
+ uniform(u.tag, u.type, u.array_size, source.uniform_data.data()+u.data_offset);
+}
+
int ProgramData::find_uniform_index(Tag tag) const
{
auto i = lower_bound_member(uniforms, tag, &TaggedUniform::tag);
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);
}
}