Access builtin resources through a global instance

[libs/gl.git] / source / materials / material.h

diff --git a/source/materials/material.h b/source/materials/material.h
index 8f387a43bfacfbdc4b2b5629d1a5a718f653a5cd..a5ee59e5ee1ecb9b181e53ffda03bf5562d0d8dd 100644 (file)
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -97,7 +97,7 @@ protected:
 public:
        virtual ~Material() { }
 
-       virtual const Program *create_compatible_shader(DataFile::Collection &, const std::map<std::string, int> & = std::map<std::string, int>()) const;
+       virtual const Program *create_compatible_shader(const std::map<std::string, int> & = std::map<std::string, int>()) const;
 protected:
        virtual void fill_program_info(std::string &, std::map<std::string, int> &) const = 0;
 
@@ -114,6 +114,8 @@ public:
        virtual const Texture *get_texture(Tag) const = 0;
        const Sampler *get_sampler() const { return sampler; }
 
+       void set_debug_name(const std::string &);
+
        template<typename T>
        static void register_type(const std::string &);
 private: