X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.h;h=dbbf5f488d6173e2b9436df925d81bdce2db8f16;hb=016f0f0dd51511f98d0bf398d99199d7dec1543c;hp=53f48a6be5cefe14f5a316a78177daff6de54d4b;hpb=e70662d7812464159f2e47f4bebb69d88f89ae93;p=libs%2Fgl.git

diff --git a/source/render/programdata.h b/source/render/programdata.h
index 53f48a6b..dbbf5f48 100644
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -2,6 +2,7 @@
 #define MSP_GL_PROGRAMDATA_H_
 
 #include <stdexcept>
+#include <msp/core/noncopyable.h>
 #include <msp/datafile/objectloader.h>
 #include "datatype.h"
 #include "matrix.h"
@@ -35,7 +36,7 @@ programs have the same layout, the same block is used for them.
 The class is optimized for an access pattern where the set of uniforms and
 programs stays constants, with only the values changing.
 */
-class ProgramData
+class ProgramData: public NonCopyable
 {
 public:
 	class Loader: public DataFile::ObjectLoader<ProgramData>
@@ -157,14 +158,12 @@ private:
 	mutable std::vector<ProgramBlock> programs;
 	mutable UniformBlock *last_buffer_block = 0;
 	mutable Buffer *buffer = 0;
+	bool streaming = false;
 	mutable Mask dirty = 0;
 	std::string debug_name;
 
 public:
 	ProgramData(const Program * = 0);
-	ProgramData(const ProgramData &);
-	ProgramData(const ProgramData &, const Program *);
-	ProgramData &operator=(const ProgramData &);
 	ProgramData(ProgramData &&);
 	~ProgramData();
 
@@ -248,10 +247,12 @@ public:
 
 	std::vector<Tag> get_uniform_tags() const;
 	void copy_uniform(const ProgramData &, Tag);
+	void copy_uniforms(const ProgramData &);
 
 private:
 	int find_uniform_index(Tag) const;
 	std::vector<ProgramBlock>::iterator get_program(const Program &) const;
+	void recreate_buffer() const;
 	void update_block_uniform_indices(SharedBlock &, const ReflectData::UniformBlockInfo &) const;
 	void update_block(SharedBlock &, const ReflectData::UniformBlockInfo &) const;
 
@@ -259,7 +260,7 @@ private:
 public:
 	/** Creates or updates UniformBlocks for a specific program if necessary,
 	then sets them to the PipelineState. */
-	void apply(const Program &, PipelineState &) const;
+	void apply(const Program &, PipelineState &, unsigned) const;
 
 	void set_debug_name(const std::string &);
 };