X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.h;h=cbb52cd4536e93bd0b2cd65c0f9868cfe946b1f5;hp=53daaa76caad73669d09aaab4ba21453e9a3b107;hb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;hpb=fc0f53b1981436d39a27884376e852dca5671fda

diff --git a/source/program.h b/source/program.h
index 53daaa76..cbb52cd4 100644
--- a/source/program.h
+++ b/source/program.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
-#include <list>
 #include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "gl.h"
@@ -31,6 +31,7 @@ public:
 
 		void attribute(unsigned, const std::string &);
 		void fragment_shader(const std::string &);
+		void geometry_shader(const std::string &);
 		void standard();
 		void vertex_shader(const std::string &);
 	};
@@ -58,7 +59,7 @@ public:
 		LayoutHash layout_hash;
 	};
 
-	typedef std::list<Shader *> ShaderList;
+	typedef std::vector<Shader *> ShaderList;
 	typedef std::map<std::string, UniformInfo> UniformMap;
 	typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
 
@@ -79,6 +80,9 @@ public:
 	/// Constructs a Program with standard features.
 	Program(const ProgramBuilder::StandardFeatures &);
 
+	/// Constructs a Program from unified source code using ProgramCompiler.
+	Program(const std::string &);
+
 	/// Constructs a Program from vertex and fragment shader source code.
 	Program(const std::string &, const std::string &);