X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftechnique.h;h=f80e2f6144e0f59d32bade49829c721df5b15d27;hp=6841f486fd3fc3096e6884eb94621ef53c56e716;hb=639238c53510fb9483e92fb1b808d33fce992bff;hpb=88a5d6707be2f62e81d46fb6d4781c75742749b8

diff --git a/source/technique.h b/source/technique.h
index 6841f486..f80e2f61 100644
--- a/source/technique.h
+++ b/source/technique.h
@@ -1,5 +1,5 @@
-#ifndef TECHNIQUE_H_
-#define TECHNIQUE_H_
+#ifndef MSP_GL_TECHNIQUE_H_
+#define MSP_GL_TECHNIQUE_H_
 
 #include "renderpass.h"
 #include "tag.h"
@@ -37,6 +37,7 @@ private:
 	private:
 		void material(const std::string &, const std::string &);
 		void texture(const std::string &, const std::string &);
+		void uniforms();
 	};
 
 public:
@@ -46,11 +47,13 @@ private:
 	PassMap passes;
 
 public:
-	RenderPass &add_pass(const GL::Tag &);
-	bool has_pass(const GL::Tag &) const;
-	const RenderPass &get_pass(const GL::Tag &) const;
+	RenderPass &add_pass(const Tag &);
+	bool has_pass(const Tag &) const;
+	const RenderPass &get_pass(const Tag &) const;
 	const PassMap &get_passes() const { return passes; }
-	void replace_texture(const std::string &, const Texture &);
+	bool replace_texture(const std::string &, const Texture &);
+	bool replace_material(const std::string &, const Material &);
+	bool replace_uniforms(const ProgramData &);
 	bool has_shaders() const;
 };