X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.h;h=53f48a6be5cefe14f5a316a78177daff6de54d4b;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hp=9d08219ef84368943f6cb4535466bc61a1c742af;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c;p=libs%2Fgl.git diff --git a/source/render/programdata.h b/source/render/programdata.h index 9d08219e..53f48a6b 100644 --- a/source/render/programdata.h +++ b/source/render/programdata.h @@ -165,6 +165,7 @@ public: ProgramData(const ProgramData &); ProgramData(const ProgramData &, const Program *); ProgramData &operator=(const ProgramData &); + ProgramData(ProgramData &&); ~ProgramData(); private: @@ -173,19 +174,26 @@ private: void mark_dirty(Mask); public: void uniform(Tag, int); + void uniform(Tag, unsigned); void uniform(Tag, float); void uniform(Tag, int, int); + void uniform(Tag, unsigned, unsigned); void uniform(Tag, float, float); void uniform2(Tag, const int *); + void uniform2(Tag, const unsigned *); void uniform2(Tag, const float *); void uniform(Tag, int, int, int); + void uniform(Tag, unsigned, unsigned, unsigned); void uniform(Tag, float, float, float); void uniform3(Tag, const int *); + void uniform3(Tag, const unsigned *); void uniform3(Tag, const float *); void uniform(Tag, int, int, int, int); + void uniform(Tag, unsigned, unsigned, unsigned, unsigned); void uniform(Tag, float, float, float, float); void uniform(Tag, const Color &); void uniform4(Tag, const int *); + void uniform4(Tag, const unsigned *); void uniform4(Tag, const float *); void uniform_matrix2(Tag, const float *); void uniform_matrix3x2(Tag, const float *); @@ -198,14 +206,19 @@ public: void uniform(Tag, const Matrix &); void uniform_matrix4(Tag, const float *); void uniform_array(Tag, unsigned, const int *); + void uniform_array(Tag, unsigned, const unsigned *); void uniform_array(Tag, unsigned, const float *); void uniform1_array(Tag, unsigned, const int *); + void uniform1_array(Tag, unsigned, const unsigned *); void uniform1_array(Tag, unsigned, const float *); void uniform2_array(Tag, unsigned, const int *); + void uniform2_array(Tag, unsigned, const unsigned *); void uniform2_array(Tag, unsigned, const float *); void uniform3_array(Tag, unsigned, const int *); + void uniform3_array(Tag, unsigned, const unsigned *); void uniform3_array(Tag, unsigned, const float *); void uniform4_array(Tag, unsigned, const int *); + void uniform4_array(Tag, unsigned, const unsigned *); void uniform4_array(Tag, unsigned, const float *); void uniform_matrix2_array(Tag, unsigned, const float *); void uniform_matrix3x2_array(Tag, unsigned, const float *);