Remove support for inline textures in RenderPass

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

diff --git a/source/renderpass.h b/source/renderpass.h
index 76c7472043e188eb09e275df0951fb769bd2f297..7a2f65688104015afe9650b4b5b6e5814a84a95f 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -17,8 +17,6 @@ class Texturing;
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
 This includes shader and data for it, material and texturing.
-
-XXX Does not delete inline texture from datafiles properly
 */
 class RenderPass
 {
@@ -31,9 +29,12 @@ public:
 
        private:
                void init();
+
                void material_inline();
                void material(const std::string &);
+               void shader(const std::string &);
                void texunit(unsigned);
+               void texunit_auto(const std::string &);
                void texunit_named(unsigned, const std::string &);
                void uniforms();
                void uniform_slot(const std::string &);
@@ -45,18 +46,15 @@ private:
        {
        private:
                unsigned index;
-               RefPtr<Texture> tex;
 
        public:
                TextureLoader(Texturing &, unsigned, Collection *);
        private:
-               virtual void finish();
-
                void texture(const std::string &);
-               void texture2d();
        };
 
-       const Program *shprog;
+       RefPtr<const Program> shprog;
+       bool shprog_from_material;
        RefPtr<ProgramData> shdata;
        std::map<std::string, std::string> uniform_slots;
        RefPtr<const Material> material;
@@ -71,8 +69,14 @@ public:
        RenderPass &operator=(const RenderPass &);
        ~RenderPass();
 
+private:
+       void finalize_material(DataFile::Collection *);
+       void maybe_create_material_shader(DataFile::Collection *);
+       void ensure_private_shader_data();
+
+public:
        void set_shader_program(const Program *, const ProgramData *);
-       const Program *get_shader_program() const { return shprog; }
+       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;
        void set_material(const Material *);