X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fprogram_backend.h;h=14650708e32abe77ee8f3ac3e851212e4b2ce895;hb=89347a620294a1136ee111edeadec68390654f78;hp=b08b70fae968e5992e1e7e026aaa5f7004c78430;hpb=959efbf61663efd7879070ce0447e02c8a447ce0;p=libs%2Fgl.git

diff --git a/source/backends/opengl/program_backend.h b/source/backends/opengl/program_backend.h
index b08b70fa..14650708 100644
--- a/source/backends/opengl/program_backend.h
+++ b/source/backends/opengl/program_backend.h
@@ -4,12 +4,13 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <msp/core/noncopyable.h>
 #include "reflectdata.h"
 
 namespace Msp {
 namespace GL {
 
-class OpenGLProgram
+class OpenGLProgram: public NonCopyable
 {
 	friend class OpenGLPipelineState;
 
@@ -22,12 +23,6 @@ protected:
 		MAX_STAGES
 	};
 
-	struct TransientData
-	{
-		std::map<std::string, unsigned> textures;
-		std::map<std::string, unsigned> blocks;
-	};
-
 	struct UniformCall
 	{
 		using FuncPtr = void (*)(unsigned, unsigned, const void *);
@@ -46,19 +41,19 @@ protected:
 	std::string debug_name;
 
 	OpenGLProgram();
+	OpenGLProgram(OpenGLProgram &&);
 	~OpenGLProgram();
 
 	bool has_stages() const;
 	unsigned add_stage(Stage);
-	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
 	void compile_glsl_stage(const GlslModule &, unsigned);
 	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 
-	void finalize(const Module &, TransientData &);
+	void link(const Module &);
 	void query_uniforms();
 	void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
 	void query_attributes();
-	void apply_bindings(const TransientData &);
 	void finalize_uniforms();
 
 	void set_debug_name(const std::string &);