X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.cpp;h=f6ad56aee13b6dc0ed740180c24e1a4b32dc57e8;hb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;hp=cfd2c0f5257b0d45d341ff15119805ea96038474;hpb=e70662d7812464159f2e47f4bebb69d88f89ae93;p=libs%2Fgl.git

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index cfd2c0f5..f6ad56ae 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -20,46 +20,6 @@ ProgramData::ProgramData(const Program *p):
 	tied_program(p)
 { }
 
-// Blocks are intentionally left uncopied
-ProgramData::ProgramData(const 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)
-{
-	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;
-}
-
 ProgramData::ProgramData(ProgramData &&other):
 	tied_program(other.tied_program),
 	uniforms(move(other.uniforms)),
@@ -482,6 +442,12 @@ void ProgramData::copy_uniform(const ProgramData &source, Tag tag)
 	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);
@@ -690,7 +656,7 @@ vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(c
 #endif
 				}
 
-				buffer->storage(required_size);
+				buffer->storage(required_size, STREAMING);
 			}
 		}
 	}
@@ -698,16 +664,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);
 		}
 }