Cosmetic fixes

[libs/gl.git] / source / renderpass.h

diff --git a/source/renderpass.h b/source/renderpass.h
index 11a9c45b7e8ef36182dc415933534d60f5518951..76c7472043e188eb09e275df0951fb769bd2f297 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -3,7 +3,6 @@
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 
 namespace Msp {
 namespace GL {
@@ -37,6 +36,8 @@ public:
                void texunit(unsigned);
                void texunit_named(unsigned, const std::string &);
                void uniforms();
+               void uniform_slot(const std::string &);
+               void uniform_slot2(const std::string &, const std::string &);
        };
 
 private:
@@ -56,8 +57,10 @@ private:
        };
 
        const Program *shprog;
-       RefPtr<const ProgramData> shdata;
+       RefPtr<ProgramData> shdata;
+       std::map<std::string, std::string> uniform_slots;
        RefPtr<const Material> material;
+       std::string material_slot;
        Texturing *texturing;
        std::map<std::string, unsigned> tex_names;
        bool back_faces;
@@ -71,8 +74,10 @@ public:
        void set_shader_program(const Program *, const ProgramData *);
        const Program *get_shader_program() const { return shprog; }
        const ProgramData *get_shader_data() const { return shdata.get(); }
+       const std::string &get_slotted_uniform_name(const std::string &) const;
        void set_material(const Material *);
        const Material *get_material() const { return material.get(); }
+       const std::string &get_material_slot_name() const { return material_slot; }
        void set_texture(unsigned, const Texture *);
        const Texturing *get_texturing() const { return texturing; }
        int get_texture_index(const std::string &) const;