X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.cpp;h=e7c171754aed006dab1ecbdcedd272ddd894a396;hb=016f0f0dd51511f98d0bf398d99199d7dec1543c;hp=a908284b3abae9de3e8f177b8165daf084ff6eba;hpb=9ec0e018234391efa66cc0f4080bfe470b910288;p=libs%2Fgl.git

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index a908284b..e7c17175 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -116,7 +116,15 @@ bool ProgramData::validate_tag(Tag tag) const
 void ProgramData::mark_dirty(Mask bits)
 {
 	if(!dirty)
+	{
+		if(generation && !streaming)
+		{
+			streaming = true;
+			if(buffer && buffer->get_size())
+				recreate_buffer();
+		}
 		++generation;
+	}
 	dirty |= bits;
 }
 
@@ -502,6 +510,21 @@ vector<ProgramData::ProgramBlock>::iterator ProgramData::get_program(const Progr
 	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;
@@ -551,14 +574,7 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Reflect
 		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;
@@ -639,24 +655,15 @@ vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(c
 
 		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));
 			}
 		}
 	}
@@ -664,16 +671,17 @@ vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(c
 	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);
 		}
 }