X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.h;h=cbb52cd4536e93bd0b2cd65c0f9868cfe946b1f5;hp=53f060d2d99fdf4fd92e55b3fefd4a956c54da2e;hb=13cf58be0e455227e8e5ae418b276a11c7873869;hpb=e3561c5c4d0b2caf00a0e50ce85c11a9fb62aa72 diff --git a/source/program.h b/source/program.h index 53f060d2..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 #include +#include #include #include "bindable.h" #include "gl.h" @@ -59,7 +59,7 @@ public: LayoutHash layout_hash; }; - typedef std::list ShaderList; + typedef std::vector ShaderList; typedef std::map UniformMap; typedef std::map UniformBlockMap; @@ -80,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 &);