X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.h;fp=source%2Fmaterials%2Frenderpass.h;h=0e8ccdf236e68b88c75d9d7ba8095f569bd37d6c;hp=b674945ee1a23136d34bd6931b074760fa7779a5;hb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;hpb=20622e74de6753c5e4460a112c11ee913707e8e8 diff --git a/source/materials/renderpass.h b/source/materials/renderpass.h index b674945e..0e8ccdf2 100644 --- a/source/materials/renderpass.h +++ b/source/materials/renderpass.h @@ -64,7 +64,7 @@ private: RefPtr shprog; bool shprog_from_material; RefPtr shdata; - std::map uniform_slots; + std::map uniform_slots; RefPtr material; std::string material_slot; Texturing *texturing; @@ -86,7 +86,7 @@ public: void set_shader_program(const Program *, const ProgramData *); const Program *get_shader_program() const { return shprog.get(); } const ProgramData *get_shader_data() const { return shdata.get(); } - const std::string &get_slotted_uniform_name(const std::string &) const; + Tag get_slotted_uniform_tag(Tag) const; void set_material(const Material *, DataFile::Collection * = 0); const Material *get_material() const { return material.get(); } const std::string &get_material_slot_name() const { return material_slot; }