X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=4d80bb775afc92f20c05714c998399909a2299a7;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=885804f010e16d868e7ab551caccb1b144824395;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2;p=libs%2Fgl.git diff --git a/source/programdata.h b/source/programdata.h index 885804f0..4d80bb77 100644 --- a/source/programdata.h +++ b/source/programdata.h @@ -3,6 +3,7 @@ #include #include +#include "program.h" namespace Msp { namespace GL { @@ -10,7 +11,6 @@ namespace GL { class Buffer; class Color; class Matrix; -class Program; class Uniform; class UniformBlock; class Vector3; @@ -81,6 +81,9 @@ public: void uniform4_array(const std::string &, unsigned, const float *); void uniform_matrix4_array(const std::string &, unsigned, const float *); +private: + const UniformBlock &get_block(const Program &, const Program::UniformBlockInfo *) const; +public: const UniformBlock &get_block(const Program &, const std::string &) const; void apply() const;