Convert svn:ignore to .gitignore

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

diff --git a/source/renderpass.h b/source/renderpass.h
index 405b813b463d0fcd1019c9483d921218b93005c0..c201eb07c807564a58c1edaa8446d0e83af2e9f6 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -39,10 +39,10 @@ public:
 
        private:
                void init();
-               virtual void finish();
                void material_inline();
                void material(const std::string &);
                void texunit(unsigned);
+               void texunit_named(unsigned, const std::string &);
                void uniforms();
        };
 
@@ -68,6 +68,7 @@ private:
        ProgramData *shdata;
        RefPtr<const Material> material;
        Texturing *texturing;
+       std::map<std::string, unsigned> tex_names;
 
        RenderPass &operator=(const RenderPass &);
 public:
@@ -81,6 +82,7 @@ public:
        const Material *get_material() const { return material.get(); }
        void set_texture(unsigned, const Texture *);
        const Texturing *get_texturing() const { return texturing; }
+       int get_texture_index(const std::string &) const;
 };
 
 } // namespace GL