X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Frenderpass.h;h=66768772f2d545a6e817c612a39873e5a9234b6d;hb=b856ccc893a102536048e8d67a6577a31ebdf166;hp=34c315b3a2c0cc797031c024d2b1f315906bff7d;hpb=72a13418cc19e750abf3f8d8a52aea5e1abe4983;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index 34c315b3..66768772 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 {
@@ -58,7 +57,7 @@ private:
 	};
 
 	const Program *shprog;
-	ProgramData *shdata;
+	RefPtr<ProgramData> shdata;
 	std::map<std::string, std::string> uniform_slots;
 	RefPtr<const Material> material;
 	std::string material_slot;
@@ -72,9 +71,13 @@ public:
 	RenderPass &operator=(const RenderPass &);
 	~RenderPass();
 
+private:
+	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; }
+	const ProgramData *get_shader_data() const { return shdata.get(); }
 	const std::string &get_slotted_uniform_name(const std::string &) const;
 	void set_material(const Material *);
 	const Material *get_material() const { return material.get(); }