X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.h;h=3570151258beb225f84ecd6ef43dd269f8579c7b;hb=3500f13f51dabadd2e7f06b81820936520cc8115;hp=3b3b54b8569e12936cf6f8ffb04dbe0d8378ed95;hpb=d713e5391dc5d85759c7aab36f6df7a85c3d8eff;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index 3b3b54b8..35701512 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -3,7 +3,6 @@
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 
 namespace Msp {
 namespace GL {
@@ -32,9 +31,11 @@ public:
 
 	private:
 		void init();
+
 		void material_inline();
 		void material(const std::string &);
 		void texunit(unsigned);
+		void texunit_auto(const std::string &);
 		void texunit_named(unsigned, const std::string &);
 		void uniforms();
 		void uniform_slot(const std::string &);
@@ -72,6 +73,11 @@ public:
 	RenderPass &operator=(const RenderPass &);
 	~RenderPass();
 
+private:
+	void finalize_material();
+	void ensure_private_shader_data();
+
+public:
 	void set_shader_program(const Program *, const ProgramData *);
 	const Program *get_shader_program() const { return shprog; }
 	const ProgramData *get_shader_data() const { return shdata.get(); }