Do not attempt to legacy-bind texture targets which do not support it

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

diff --git a/source/renderpass.h b/source/renderpass.h
index c90108d1c27be58632c313e77f491012dcfb8b79..3b3b54b8569e12936cf6f8ffb04dbe0d8378ed95 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -37,6 +37,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,7 +58,8 @@ private:
        };
 
        const Program *shprog;
-       ProgramData *shdata;
+       RefPtr<ProgramData> shdata;
+       std::map<std::string, std::string> uniform_slots;
        RefPtr<const Material> material;
        std::string material_slot;
        Texturing *texturing;
@@ -71,7 +74,8 @@ 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; }
+       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; }